diff --git a/signal/server/signal.go b/signal/server/signal.go
index 6dda9f6a1..3e8143556 100644
--- a/signal/server/signal.go
+++ b/signal/server/signal.go
@@ -149,6 +149,9 @@ func (s *Server) SendWithDeliveryCheck(ctx context.Context, msg *proto.Encrypted
 	}
 
 	if _, err := s.dispatcher.SendMessage(ctx, msg, true); err != nil {
+		if errors.Is(err, dispatcher.ErrPeerNotConnected) {
+			return nil, status.Errorf(codes.NotFound, "remote peer not connected")
+		}
 		return nil, err
 	}