diff --git a/src/d_main.c b/src/d_main.c
index 3b72cb3b2..18acb191d 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -803,8 +803,11 @@ void D_SRB2Loop(void)
 		HW3S_BeginFrameUpdate();
 #endif
 
-		I_NewTwodeeFrame();
-		I_NewImguiFrame();
+		if (rendermode != render_none)
+		{
+			I_NewTwodeeFrame();
+			I_NewImguiFrame();
+		}
 
 		if (realtics > 0 || singletics)
 		{
@@ -1497,8 +1500,11 @@ void D_SRB2Main(void)
 	CONS_Printf("I_StartupGraphics()...\n");
 	I_StartupGraphics();
 
-	I_NewTwodeeFrame();
-	I_NewImguiFrame();
+	if (rendermode != render_none)
+	{
+		I_NewTwodeeFrame();
+		I_NewImguiFrame();
+	}
 
 #ifdef HWRENDER
 	// Lactozilla: Add every hardware mode CVAR and CCMD.
@@ -1653,7 +1659,7 @@ void D_SRB2Main(void)
 		}
 
 		{
-			if (!M_CheckParm("-server"))
+			if (!M_CheckParm("-server") && !M_CheckParm("-dedicated"))
 			{
 				G_SetUsedCheats();
 
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 289a6c3a7..24aa174ee 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -237,7 +237,9 @@ void ST_Start(void)
 		ST_Stop();
 
 	ST_InitData();
-	st_stopped = false;
+
+	if (!dedicated)
+		st_stopped = false;
 }
 
 //