diff --git a/packet-service/src/main.rs b/packet-service/src/main.rs
index 14e2014..120cd62 100644
--- a/packet-service/src/main.rs
+++ b/packet-service/src/main.rs
@@ -66,9 +66,13 @@ async fn handle_connection(stream: &mut TcpStream, pool: Arc<BufferPool>, auth_c
     }
 
     if let Some(state) = connection_service.get_connection(&connection_id) {
-        let session_id = state.session_id.unwrap();
-        let mut auth_client = auth_client.lock().await;
-        auth_client.logout(&session_id).await?;
+        let session_id = state.session_id.unwrap_or_default();
+        if !session_id.is_empty() {
+            let mut auth_client = auth_client.lock().await;
+            auth_client.logout(&session_id).await?;
+        } else {
+            warn!("No session found for {}", stream.peer_addr()?);
+        }
     }
     ACTIVE_CONNECTIONS.dec();
     Ok(())