diff --git a/src/core.h b/src/core.h
index e63db39..9b85dd3 100644
--- a/src/core.h
+++ b/src/core.h
@@ -948,6 +948,8 @@ namespace Core {
 
     void endFrame() {
         GAPI::endFrame();
+        GAPI::setTarget(NULL, 0);
+        validateRenderState();
         Core::stats.stop();
     }
 
diff --git a/src/level.h b/src/level.h
index 7b71669..f74f167 100644
--- a/src/level.h
+++ b/src/level.h
@@ -285,8 +285,6 @@ struct Level : IGame {
             Core::reset();
             Core::beginFrame();
             inventory.prepareBackground();
-            Core::setTarget(NULL, 0);
-            Core::validateRenderState();
             Core::endFrame();
         }
     }
@@ -2642,4 +2640,4 @@ struct Level : IGame {
 
 };
 
-#endif
\ No newline at end of file
+#endif