diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index faaaf10b..b329cc77 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -237,7 +237,7 @@ void GPU3D::Reset() noexcept
     TotalParams = 0;
 
     GeometryEnabled = false;
-    RenderingEnabled = false;
+    RenderingEnabled = 0;
 
     DispCnt = 0;
     AlphaRefVal = 0;
@@ -550,12 +550,16 @@ void GPU3D::DoSavestate(Savestate* file) noexcept
 
     file->Bool32(&AbortFrame);
     file->Bool32(&GeometryEnabled);
-    file->Bool32(&RenderingEnabled);
+    file->Var8(&RenderingEnabled);
     file->Var32(&PolygonMode);
     file->Var32(&PolygonAttr);
     file->Var32(&CurPolygonAttr);
     file->Var32(&TexParam);
     file->Var32(&TexPalette);
+    
+    file->Var8(&RDLines);
+    file->Var8(&RDLinesTemp);
+
     RenderFrameIdentical = false;
     if (softRenderer && softRenderer->IsThreaded())
     {
@@ -568,10 +572,19 @@ void GPU3D::DoSavestate(Savestate* file) noexcept
 void GPU3D::SetEnabled(bool geometry, bool rendering) noexcept
 {
     GeometryEnabled = geometry;
-    RenderingEnabled = rendering;
-
-    if (!rendering) ResetRenderingState();
-    else RDLinesTemp = 63; // resets to 63 when the rasterizer is toggled on
+    if (rendering)
+    {
+        if (RenderingEnabled == 0)
+        {
+            RenderingEnabled = 1;
+            RDLinesTemp = 63; // CHECKME
+        }
+    }
+    else
+    {
+        ResetRenderingState();
+        RenderingEnabled = 0;
+    }
 }
 
 
@@ -2438,11 +2451,11 @@ void GPU3D::VBlank() noexcept
 
     if (GeometryEnabled)
     {
-        if (RenderingEnabled)
+        if (RenderingEnabled >= 3)
         {
-            RDLines = RDLinesTemp;
             if (FlushRequest)
             {
+                swap:
                 if (NumPolygons)
                 {
                     // separate translucent polygons from opaque ones
@@ -2496,6 +2509,15 @@ void GPU3D::VBlank() noexcept
             RenderClearAttr1 = ClearAttr1;
             RenderClearAttr2 = ClearAttr2;
         }
+        else if (RenderingEnabled != 0)
+        {
+            if (FlushRequest)
+            {
+                RenderingEnabled++;
+                if (RenderingEnabled >= 3)
+                    goto swap;
+            }
+        }
 
         if (FlushRequest)
         {
diff --git a/src/GPU3D.h b/src/GPU3D.h
index b1684ead..f3725fa0 100644
--- a/src/GPU3D.h
+++ b/src/GPU3D.h
@@ -243,7 +243,11 @@ public:
     u32 TotalParams = 0;
 
     bool GeometryEnabled = false;
-    bool RenderingEnabled = false;
+    // 0 = powered off
+    // 1 = powered on, inactive
+    // 2 = one swap buffers, inactive
+    // 3 = two swap buffers, active;
+    u8 RenderingEnabled = 0;
 
     u32 DispCnt = 0;
 
diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp
index d68d44da..5da6cd78 100644
--- a/src/GPU3D_Soft.cpp
+++ b/src/GPU3D_Soft.cpp
@@ -2024,7 +2024,7 @@ void SoftRenderer::RenderFrame(GPU& gpu)
         //init internal buffer
         ClearBuffers(gpu);
 
-        if (gpu.GPU3D.RenderNumPolygons > 0)
+        if (gpu.GPU3D.RenderingEnabled >= 3)
             RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons);
         else
             memcpy(FinalBuffer, ColorBuffer, sizeof(FinalBuffer));
@@ -2061,7 +2061,7 @@ void SoftRenderer::RenderThreadFunc(GPU& gpu)
             //init internal buffer
             ClearBuffers(gpu);
 
-            if (gpu.GPU3D.RenderNumPolygons > 0)
+            if (gpu.GPU3D.RenderingEnabled >= 3)
                 RenderPolygons(gpu, &gpu.GPU3D.RenderPolygonRAM[0], gpu.GPU3D.RenderNumPolygons);
             else
             {