diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
index 7fa5a6f..fb57727 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
@@ -202,7 +202,7 @@ public class ClientConnectionHandler implements Runnable {
         if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message: " + state);
 
         Matcher matcher = messagePattern.matcher(messageString);
-        if (matcher.find()) {
+        if (messageString != "" && matcher.find()) {
             String receiver = matcher.group(1);
             String message = matcher.group(2);
             if (receiver == null || receiver.isBlank()) receiver = ClientConnectionHandler.USER_ALL;