diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 9477e1bf..84aeb1ff 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -46,13 +46,7 @@ public class SendCommand implements DbusCommand {
             return 1;
         }
 
-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ns.getString("group") == null) {
-            System.err.println("No recipients given");
-            System.err.println("Aborting sending.");
-            return 1;
-        }
-
-        if (ns.getBoolean("endsession")) {
+        if (ns.getBoolean("endsession") && ns.getList("recipient") != null && ns.getList("recipient").size() > 0) {
             try {
                 signal.sendEndSessionMessage(ns.<String>getList("recipient"));
                 return 0;
@@ -71,6 +65,12 @@ public class SendCommand implements DbusCommand {
             }
         }
 
+        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ns.getString("group") == null) {
+            System.err.println("No recipients given");
+            System.err.println("Aborting sending.");
+            return 1;
+        }
+
         String messageText = ns.getString("message");
         if (messageText == null) {
             try {