diff --git a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
index b64900de..b2c8d77e 100644
--- a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
+++ b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
@@ -480,10 +480,9 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
                                 { output.pushResult(callback, result) }
                             } catch (e: Throwable) {
                                 { output.pushThrowable(callback, e) }
-                            } finally {
-                                cancellables.remove(callback)
                             }
-                            withContext(callbackWorker) { result() }
+                            cancellables.remove(callback)
+                            withContext(callbackWorker + NonCancellable) { result() }
                         }
                     }
                     is RootCommandChannel<*> -> defaultWorker.launch {
@@ -502,10 +501,9 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
                             }
                         } catch (e: Throwable) {
                             { output.pushThrowable(callback, e) }
-                        } finally {
-                            cancellables.remove(callback)
                         }
-                        withContext(callbackWorker) { result() }
+                        cancellables.remove(callback)
+                        withContext(callbackWorker + NonCancellable) { result() }
                     }
                     is Shutdown -> break@loop
                     else -> throw IllegalArgumentException("Unrecognized input: $command")