diff --git a/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp b/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
index 790eb5b..3cc9ab2 100644
--- a/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
+++ b/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
@@ -170,6 +170,10 @@ namespace DDraw
 		{
 			return DDERR_NOTFOUND;
 		}
+		if (gdiSurface == g_primarySurface)
+		{
+			return DD_OK;
+		}
 		return g_primarySurface.get()->lpVtbl->Flip(g_primarySurface, gdiSurface, DDFLIP_WAIT);
 	}