diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 45a1388378..4b64eda9db 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -338,8 +338,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 	// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
 	static LLCachedControl<F32> teleportArrivalDelay(gSavedSettings, "TeleportArrivalDelay");
-	static LLCachedControl<bool> fsDisableTeleportScreens(gSavedSettings, "FSDisableTeleportScreens");
-	if (postTeleportResetVB && (!fsDisableTeleportScreens || postTeleportResetVBTimer.getElapsedTimeF32() > teleportArrivalDelay()))
+	if (postTeleportResetVB && postTeleportResetVBTimer.getElapsedTimeF32() > teleportArrivalDelay())
 	{
 		LL_INFOS("Teleport") << "Resetting Vertex Buffers after TP finished" << LL_ENDL;
 		postTeleportResetVB = false;
@@ -571,6 +570,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 			// <FS:Ansariel> FIRE-12004: Attachments getting lost on TP
 			gPostTeleportFinishKillObjectDelayTimer.reset();
+
+			// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
+			postTeleportResetVB = true;
+			postTeleportResetVBTimer.start();
+			// </FS:Ansariel>
 			break;
 
 		case LLAgent::TELEPORT_ARRIVING:
@@ -612,10 +616,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// No teleport in progress
 			gViewerWindow->setShowProgress(FALSE,FALSE);
 			gTeleportDisplay = FALSE;
-			// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
-			postTeleportResetVB = true;
-			postTeleportResetVBTimer.start();
-			// </FS:Ansariel>
 			break;
 		}
 	}