diff --git a/cmd/root.go b/cmd/root.go
index 5391d302a88d6c32ef0da25527926223e82a2207..671e8aefb280cb1f33f0fe77f978ff96206ca1ae 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -384,8 +384,14 @@ var rootCmd = &cobra.Command{
 			cryptoType = parse.E2E
 		}
 
-		// Only send a message if we have a message to send (except dummy messages)
-		recipientId := id.NewUserFromUints(&[4]uint64{0, 0, 0, destinationUserId})
+		var recipientId *id.User
+
+		if destinationUserId == 0 {
+			recipientId = userID
+		} else {
+			recipientId = id.NewUserFromUints(&[4]uint64{0, 0, 0, destinationUserId})
+		}
+
 		if message != "" {
 			// Get the recipient's nick
 			recipientNick := ""