diff --git a/neo/renderer/RenderLog.cpp b/neo/renderer/RenderLog.cpp
index 948699b0..034d9dbc 100644
--- a/neo/renderer/RenderLog.cpp
+++ b/neo/renderer/RenderLog.cpp
@@ -127,6 +127,8 @@ void idRenderLog::Init()
 
 void idRenderLog::Shutdown()
 {
+	commandList = nullptr;
+
 	for( int i = 0; i < MRB_TOTAL * NUM_FRAME_DATA; i++ )
 	{
 		timerQueries[i].Reset();
diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
index 04126a5f..218e5b95 100755
--- a/neo/renderer/RenderSystem_init.cpp
+++ b/neo/renderer/RenderSystem_init.cpp
@@ -2199,8 +2199,8 @@ void idRenderSystemLocal::Shutdown()
 	UnbindBufferObjects();
 
 	// SRS - wait for fence to hit before freeing any resources the GPU may be using, otherwise get Vulkan validation layer errors on shutdown
-	// SRS - skip this step if we are in Doom 3 mode (com_smp = -1) which has already finished and presented
-	if( com_smp.GetInteger() != -1 )
+	// SRS - skip this step if we are in a Doom Classic game
+	if( common->GetCurrentGame() == DOOM3_BFG )
 	{
 		backend.GL_BlockingSwapBuffers();
 	}