diff --git a/lib/src/server/handler.dart b/lib/src/server/handler.dart
index 065d59e..038d969 100644
--- a/lib/src/server/handler.dart
+++ b/lib/src/server/handler.dart
@@ -77,6 +77,9 @@ class ServerHandler_ extends ServiceCall {
         .transform(grpcDecompressor())
         .listen(_onDataIdle,
             onError: _onError, onDone: _onDoneError, cancelOnError: true);
+    _stream.outgoingMessages.done.then((_) {
+      cancel();
+    });
   }
 
   /// Cancel response subscription, if active. If the stream exits with an