diff --git a/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt b/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt
index a58e6bece..13d347688 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt
@@ -42,7 +42,12 @@ class SecondaryDisplay(val context: Context) : DisplayManager.DisplayListener {
     }
 
     fun updateSurface() {
-        NativeLibrary.secondarySurfaceChanged(pres!!.getSurfaceHolder().surface)
+        val surface = pres?.getSurfaceHolder()?.surface
+        if (surface != null && surface.isValid) {
+            NativeLibrary.secondarySurfaceChanged(surface)
+        } else {
+            Log.w("SecondaryDisplay", "Attempted to update null or invalid surface")
+        }
     }
 
     fun destroySurface() {
diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cpp
index df2096e75..548fac315 100644
--- a/src/android/app/src/main/jni/emu_window/emu_window.cpp
+++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp
@@ -18,8 +18,8 @@
 #include "video_core/renderer_base.h"
 
 bool EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
-    int w = ANativeWindow_getWidth(surface);
-    int h = ANativeWindow_getHeight(surface);
+    int w = surface== NULL ? 0 : ANativeWindow_getWidth(surface);
+    int h = surface== NULL ? 0 : ANativeWindow_getHeight(surface);
     if (render_window == surface && w == window_width && h == window_height) {
         return false;
     }