diff --git a/packages/compositor/src/remote/RemoteAppLauncher.ts b/packages/compositor/src/remote/RemoteAppLauncher.ts
index 68627d41..2eca7140 100644
--- a/packages/compositor/src/remote/RemoteAppLauncher.ts
+++ b/packages/compositor/src/remote/RemoteAppLauncher.ts
@@ -560,6 +560,9 @@ function setupClientOutOfBandHandlers(client: Client, outOfBandChannel: RemoteOu
     const commitSerial = payload[1]
 
     const wlSurface = client.connection.wlObjects[resourceId] as WlSurfaceResource
+    if (wlSurface === undefined) {
+      return
+    }
     const surface = wlSurface.implementation as Surface
     surface.commitSerials.push(commitSerial)
   })