diff --git a/kotlin/src/main/kotlin/app/rive/RiveUI.kt b/kotlin/src/main/kotlin/app/rive/RiveUI.kt
index 5518f8ee..503cd888 100644
--- a/kotlin/src/main/kotlin/app/rive/RiveUI.kt
+++ b/kotlin/src/main/kotlin/app/rive/RiveUI.kt
@@ -256,14 +256,16 @@ fun RiveUI(
                 }
 
                 commandQueue.advanceStateMachine(stateMachineHandle, deltaTimeNs)
-                commandQueue.draw(
+                surface?.let { surface ->
+                  commandQueue.draw(
                     artboardHandle,
                     stateMachineHandle,
                     fit,
                     alignment,
-                    surface!!,
+                    surface,
                     clearColor
-                )
+                  )
+                }
             }
         }
     }