diff --git a/app/src/main/cpp/skyline/gpu/presentation_engine.cpp b/app/src/main/cpp/skyline/gpu/presentation_engine.cpp
index 1337e6e5..13750485 100644
--- a/app/src/main/cpp/skyline/gpu/presentation_engine.cpp
+++ b/app/src/main/cpp/skyline/gpu/presentation_engine.cpp
@@ -401,7 +401,11 @@ namespace skyline::gpu {
     }
 
     NativeWindowTransform PresentationEngine::GetTransformHint() {
-        std::unique_lock lock{mutex};
+        if (!vkSurface.has_value()) {
+            std::unique_lock lock{mutex};
+            surfaceCondition.wait(lock, [this]() { return vkSurface.has_value(); });
+        }
+
         return GetAndroidTransform(vkSurfaceCapabilities.currentTransform);
     }
 }