diff --git a/signal/server/signal.go b/signal/server/signal.go
index 84234077a..3522899c6 100644
--- a/signal/server/signal.go
+++ b/signal/server/signal.go
@@ -103,9 +103,7 @@ func (s *Server) Send(ctx context.Context, msg *proto.EncryptedMessage) (*proto.
 		s.metrics.MessageForwardFailures.Add(ctx, 1, metric.WithAttributes(attribute.String(labelType, labelTypeSenderNotRegistered)))
 		log.Tracef("message from peer [%s] can't be forwarded to peer [%s] because sender peer is not registered", msg.Key, msg.RemoteKey)
 		// return nil, status.Errorf(codes.FailedPrecondition, "peer not registered")
-	}
-
-	if !peer.SendMessageAllowed(msg.RemoteKey, len(msg.Body), time.Now()) {
+	} else if !peer.SendMessageAllowed(msg.RemoteKey, len(msg.Body), time.Now()) {
 		if peer == nil {
 			s.metrics.MessageForwardFailures.Add(ctx, 1, metric.WithAttributes(attribute.String(labelType, labelTypeMessageSuppressedDisconnected)))
 		} else {