diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index f92e1b9d22..fc929540dd 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -2068,6 +2068,9 @@ void P_FinishLoadingLineDef(line_t *ld, int alpha)
 		ld->special = 0;
 		break;
 	}
+
+	// [ZZ] check initial portal link
+	P_CheckPortal(ld);
 }
 // killough 4/4/98: delay using sidedefs until they are loaded
 void P_FinishLoadingLineDefs ()
@@ -2177,11 +2180,6 @@ void P_LoadLineDefs (MapData * map)
 		if (level.flags2 & LEVEL2_WRAPMIDTEX) ld->flags |= ML_WRAP_MIDTEX;
 		if (level.flags2 & LEVEL2_CHECKSWITCHRANGE) ld->flags |= ML_CHECKSWITCHRANGE;
 	}
-
-	// [ZZ] check initial portal link
-	for (int i = 0; i < numlines; i++)
-		P_CheckPortal(&lines[i]);
-
 	delete[] mldf;
 }
 
diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp
index 5b6c0b60fa..366a56dcf6 100644
--- a/src/p_udmf.cpp
+++ b/src/p_udmf.cpp
@@ -1792,11 +1792,6 @@ public:
 			P_AdjustLine(&lines[line]);
 			P_FinishLoadingLineDef(&lines[line], tempalpha[0]);
 		}
-
-		// [ZZ] check initial portal link
-		for (int i = 0; i < numlines; i++)
-			P_CheckPortal(&lines[i]);
-
 		assert(side <= numsides);
 		if (side < numsides)
 		{