diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java
index 4021c62e..5953fd76 100644
--- a/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java
+++ b/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java
@@ -10,6 +10,7 @@ import bisq.proto.grpc.SendNotificationReply;
 import bisq.proto.grpc.SendNotificationRequest;
 import io.grpc.Context;
 import io.grpc.ServerInterceptor;
+import io.grpc.stub.ServerCallStreamObserver;
 import io.grpc.stub.StreamObserver;
 
 import javax.inject.Inject;
@@ -80,7 +81,9 @@ class GrpcNotificationsService extends NotificationsImplBase {
 
         @Override
         public void onMessage(@NonNull NotificationMessage message) {
-            responseObserver.onNext(message);
+            if (!((ServerCallStreamObserver<NotificationMessage>) responseObserver).isCancelled()) {
+                responseObserver.onNext(message);
+            }
         }
     }