diff --git a/nx/source/gfx/gfx.c b/nx/source/gfx/gfx.c
index f9711c7c..2745c2ca 100644
--- a/nx/source/gfx/gfx.c
+++ b/nx/source/gfx/gfx.c
@@ -302,6 +302,7 @@ static void _waitevent(Handle *handle) {
 
 void gfxWaitForVsync() {
     _waitevent(&g_gfxDisplayVsyncEvent);
+    _waitevent(&g_gfxDisplayVsyncEvent);
 }
 
 void gfxSwapBuffers() {
@@ -311,11 +312,6 @@ void gfxSwapBuffers() {
 
     if (R_SUCCEEDED(rc)) rc = _gfxDequeueBuffer();
 
-    #ifdef BUFFERSWAP_DELAY_HACK
-    gfxWaitForVsync();
-    gfxWaitForVsync();
-    #endif
-
     if (R_FAILED(rc)) fatalSimple(rc);
 }