diff --git a/server/router.go b/server/router.go
index 44b5f94..f81c2f8 100644
--- a/server/router.go
+++ b/server/router.go
@@ -59,9 +59,8 @@ func (r *RedisRouter) Route(msg *meowlib.ToServerMessage) (*meowlib.FromServerMe
 		if err != nil {
 			return nil, err
 		}
-		if msg.Timeout > 0 {
+		if msg.Timeout > 0 && len(from_server.Chat) == 0 && from_server.Invitation == nil {
 			logger.Info().Msg("long poll, subscribing for messages")
-			// set timeout for the lookup
 			from_server, err = r.subscribe(msg, int(msg.Timeout))
 			if err != nil {
 				return nil, err