diff --git a/src/libwhb/src/gfx.c b/src/libwhb/src/gfx.c
index d1159da0..a0c20209 100644
--- a/src/libwhb/src/gfx.c
+++ b/src/libwhb/src/gfx.c
@@ -435,6 +435,7 @@ WHBGfxShutdown()
    }
 
    GfxProcCallbackReleased(NULL);
+   GX2RSetAllocator(NULL, NULL);
    GX2Shutdown();
 
    if (sTvContextState) {
@@ -451,8 +452,6 @@ WHBGfxShutdown()
       GfxHeapFreeMEM2(sCommandBufferPool);
       sCommandBufferPool = NULL;
    }
-
-   GX2RSetAllocator(NULL, NULL);
 }
 
 void
@@ -466,7 +465,6 @@ WHBGfxBeginRender()
       GX2GetSwapStatus(&swapCount, &flipCount, &lastFlip, &lastVsync);
 
       if (flipCount >= swapCount) {
-         sGpuTimedOut = FALSE;
          break;
       }