diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index ddcbe9889f..fa0c434178 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -198,6 +198,11 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
         freopen("CONOUT$", "wb", stderr);
     }
 #endif
+#ifdef __OPENORBIS__
+    // May prevent spurious crashes on swap handlers...
+    setvbuf(stdout, nullptr, _IONBF, 0);
+    setvbuf(stderr, nullptr, _IONBF, 0);
+#endif
 
     Common::Log::Initialize();
     Common::Log::SetColorConsoleBackendEnabled(true);