diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index d0945373..47843e4f 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -489,8 +489,12 @@ void DoSavestate(Savestate* file)
         ClipMatrixDirty = true;
         UpdateClipMatrix();
 
-        CurVertexRAM = &VertexRAM[CurRAMBank];
-        CurPolygonRAM = &PolygonRAM[CurRAMBank];
+        CurVertexRAM = &VertexRAM[CurRAMBank ? 6144 : 0];
+        CurPolygonRAM = &PolygonRAM[CurRAMBank ? 2048 : 0];
+
+        // better safe than sorry, I guess
+        // might cause a blank frame but atleast it won't shit itself
+        RenderNumPolygons = 0;
     }
 }