diff --git a/src/lavinmq/mqtt/broker.cr b/src/lavinmq/mqtt/broker.cr
index 675a410ac4..d599f00be0 100644
--- a/src/lavinmq/mqtt/broker.cr
+++ b/src/lavinmq/mqtt/broker.cr
@@ -32,8 +32,8 @@ module LavinMQ
 
       def session_present?(client_id : String, clean_session) : Bool
         return false if clean_session
-        session = sessions[client_id]?
-        return false if session.nil? || session.clean_session?
+        session = sessions[client_id]? || return false
+        return false if session.clean_session?
         true
       end