diff --git a/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java b/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
index 6b11c1569..ded021d9f 100644
--- a/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
+++ b/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
@@ -111,7 +111,7 @@ public class VulkanTextureViewRenderThread extends TextureViewRenderThread {
         if (destroySurface) {
           mapRenderer.onSurfaceDestroyed();
           destroySurface = false;
-          break;
+          continue;
         }
 
         // If the surface size has changed inform the map renderer.
@@ -121,6 +121,10 @@ public class VulkanTextureViewRenderThread extends TextureViewRenderThread {
           continue;
         }
 
+        if (surface == null) {
+          continue;
+        }
+
         // Time to render a frame
         mapRenderer.onDrawFrame();
       }