diff --git a/Source/levels/drlg_l4.cpp b/Source/levels/drlg_l4.cpp
index b5f96d876..cb39cf75a 100644
--- a/Source/levels/drlg_l4.cpp
+++ b/Source/levels/drlg_l4.cpp
@@ -1112,10 +1112,10 @@ bool PlaceStairs(lvl_entry entry)
 		}
 	} else {
 		// Place hell gate
-		bool isGateOpen = UseMultiplayerQuests() || Quests[Q_DIABLO]._qactive == QUEST_ACTIVE;
-		position = PlaceMiniSet(isGateOpen ? L4PENTA2 : L4PENTA);
+		position = PlaceMiniSet(L4PENTA2);
 		if (!position)
 			return false;
+		Quests[Q_DIABLO].position = *position;
 		if (entry == ENTRY_PREV)
 			ViewPosition = position->megaToWorld() + Displacement { 6, 5 };
 	}
@@ -1180,6 +1180,10 @@ void GenerateLevel(lvl_entry entry)
 	DRLG_CheckQuests(SetPieceRoom.position);
 
 	if (currlevel == 15) {
+		bool isGateOpen = UseMultiplayerQuests() || Quests[Q_DIABLO]._qactive == QUEST_ACTIVE;
+		if (!isGateOpen)
+			L4PENTA.place(Quests[Q_DIABLO].position);
+
 		for (WorldTileCoord j = 1; j < DMAXY; j++) {
 			for (WorldTileCoord i = 1; i < DMAXX; i++) {
 				if (IsAnyOf(dungeon[i][j], 98, 107)) {
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 0297af219..bae3dd4a6 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -683,6 +683,14 @@ void ResyncQuests()
 		Quests[Q_BETRAYER]._qvar2 = 2;
 		NetSendCmdQuest(true, Quests[Q_BETRAYER]);
 	}
+	if (currlevel == Quests[Q_DIABLO]._qlevel
+	    && !setlevel
+	    && Quests[Q_DIABLO]._qactive == QUEST_ACTIVE
+	    && gbIsMultiplayer) {
+		Point posPentagram = Quests[Q_DIABLO].position;
+		ObjChangeMapResync(posPentagram.x, posPentagram.y, posPentagram.x + 5, posPentagram.y + 5);
+		InitL4Triggers();
+	}
 }
 
 void DrawQuestLog(const Surface &out)