diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1ea0d21b0..ad4adb7eb 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1955,9 +1955,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 	{
 		I_OsPolling();
 
-		I_NewTwodeeFrame();
-		I_NewImguiFrame();
-
 		// Needs to be updated here for M_DrawEggaChannel
 		renderdeltatics = FRACUNIT;
 		rendertimefrac = FRACUNIT;
@@ -2025,6 +2022,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 #endif
 			}
 			I_UpdateNoVsync(); // page flip or blit buffer
+			I_NewTwodeeFrame();
 #ifdef HWRENDER
 			if (moviemode && rendermode == render_opengl)
 				M_LegacySaveFrame();
diff --git a/src/d_main.c b/src/d_main.c
index cf24bdf37..6bfff3269 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -876,7 +876,6 @@ void D_SRB2Loop(void)
 		if (rendermode != render_none)
 		{
 			I_NewTwodeeFrame();
-			I_NewImguiFrame();
 		}
 
 		if (realtics > 0 || singletics)
diff --git a/src/i_video_common.cpp b/src/i_video_common.cpp
index f9acae777..be894beb7 100644
--- a/src/i_video_common.cpp
+++ b/src/i_video_common.cpp
@@ -291,6 +291,7 @@ static InternalPassData build_pass_manager()
 			rhi.present();
 			rhi.finish();
 			framebuffer_manager->reset_post();
+			I_NewImguiFrame();
 		}
 	);
 
@@ -471,6 +472,7 @@ void I_FinishUpdateWipeStartScreen(void)
 	maybe_reinit_passes(rhi);
 
 	g_passes->wipe_capture_start_rendering->render(*rhi);
+	I_NewImguiFrame();
 }
 
 void I_FinishUpdateWipeEndScreen(void)
@@ -501,6 +503,7 @@ void I_FinishUpdateWipeEndScreen(void)
 	maybe_reinit_passes(rhi);
 
 	g_passes->wipe_capture_end_rendering->render(*rhi);
+	I_NewImguiFrame();
 }
 
 void I_FinishUpdateWipe(void)