diff --git a/src/GPU.cpp b/src/GPU.cpp
index 077fc8ba..8cb8d737 100644
--- a/src/GPU.cpp
+++ b/src/GPU.cpp
@@ -176,6 +176,8 @@ void DeInit()
     Framebuffer[0][1] = nullptr;
     Framebuffer[1][0] = nullptr;
     Framebuffer[1][1] = nullptr;
+
+    CurGLCompositor = nullptr;
 }
 
 void ResetVRAMCache()
diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index dcd5bd72..8cc380ad 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -286,6 +286,7 @@ bool Init()
 
 void DeInit()
 {
+    CurrentRenderer = nullptr;
 }
 
 void ResetRenderingState()
diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp
index f7078b57..8848a541 100644
--- a/src/GPU3D_Soft.cpp
+++ b/src/GPU3D_Soft.cpp
@@ -39,6 +39,7 @@ void SoftRenderer::StopRenderThread()
         Platform::Semaphore_Post(Sema_RenderStart);
         Platform::Thread_Wait(RenderThread);
         Platform::Thread_Free(RenderThread);
+        RenderThread = nullptr;
     }
 }
 
@@ -81,6 +82,7 @@ SoftRenderer::SoftRenderer() noexcept
     Threaded = false;
     RenderThreadRunning = false;
     RenderThreadRendering = false;
+    RenderThread = nullptr;
 }
 
 SoftRenderer::~SoftRenderer()