diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java
index 8afd8f283d..96d45834c9 100644
--- a/src/main/java/client/Client.java
+++ b/src/main/java/client/Client.java
@@ -78,11 +78,9 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -256,7 +254,7 @@ public class Client extends ChannelInboundHandlerAdapter {
     private void closeMapleSession() {
         switch (type) {
             case LOGIN -> SessionCoordinator.getInstance().closeLoginSession(this);
-            case CHANNEL -> SessionCoordinator.getInstance().closeSession(this, null);
+            case CHANNEL -> SessionCoordinator.getInstance().closeSession(this, false);
         }
 
         try {
diff --git a/src/main/java/net/server/coordinator/session/SessionCoordinator.java b/src/main/java/net/server/coordinator/session/SessionCoordinator.java
index 29f340ad61..ac37245257 100644
--- a/src/main/java/net/server/coordinator/session/SessionCoordinator.java
+++ b/src/main/java/net/server/coordinator/session/SessionCoordinator.java
@@ -294,7 +294,7 @@ public class SessionCoordinator {
         return fakeClient;
     }
 
-    public void closeSession(Client client, Boolean immediately) {
+    public void closeSession(Client client, boolean immediately) {
         if (client == null) {
             client = fetchInTransitionSessionClient(client);
         }
@@ -317,7 +317,7 @@ public class SessionCoordinator {
             }
         }
 
-        if (immediately != null && immediately) {
+        if (immediately) {
             client.closeSession();
         }
     }
diff --git a/src/main/java/net/server/handlers/login/AfterLoginHandler.java b/src/main/java/net/server/handlers/login/AfterLoginHandler.java
index 6c5337322f..bcf6d1d946 100644
--- a/src/main/java/net/server/handlers/login/AfterLoginHandler.java
+++ b/src/main/java/net/server/handlers/login/AfterLoginHandler.java
@@ -57,7 +57,7 @@ public final class AfterLoginHandler extends AbstractPacketHandler {
                 c.sendPacket(PacketCreator.requestPinAfterFailure());
             }
         } else if (c2 == 0 && c3 == 5) {
-            SessionCoordinator.getInstance().closeSession(c, null);
+            SessionCoordinator.getInstance().closeSession(c, false);
             c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
         }
     }
diff --git a/src/main/java/net/server/handlers/login/RegisterPinHandler.java b/src/main/java/net/server/handlers/login/RegisterPinHandler.java
index db73ea9327..e934f98ff0 100644
--- a/src/main/java/net/server/handlers/login/RegisterPinHandler.java
+++ b/src/main/java/net/server/handlers/login/RegisterPinHandler.java
@@ -35,7 +35,7 @@ public final class RegisterPinHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
         byte c2 = p.readByte();
         if (c2 == 0) {
-            SessionCoordinator.getInstance().closeSession(c, null);
+            SessionCoordinator.getInstance().closeSession(c, false);
             c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
         } else {
             String pin = p.readString();
@@ -43,7 +43,7 @@ public final class RegisterPinHandler extends AbstractPacketHandler {
                 c.setPin(pin);
                 c.sendPacket(PacketCreator.pinRegistered());
 
-                SessionCoordinator.getInstance().closeSession(c, null);
+                SessionCoordinator.getInstance().closeSession(c, false);
                 c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
             }
         }
diff --git a/src/main/java/net/server/handlers/login/SetGenderHandler.java b/src/main/java/net/server/handlers/login/SetGenderHandler.java
index 40bc9c3f0b..255dd19c84 100644
--- a/src/main/java/net/server/handlers/login/SetGenderHandler.java
+++ b/src/main/java/net/server/handlers/login/SetGenderHandler.java
@@ -43,7 +43,7 @@ public class SetGenderHandler extends AbstractPacketHandler {
 
                 Server.getInstance().registerLoginState(c);
             } else {
-                SessionCoordinator.getInstance().closeSession(c, null);
+                SessionCoordinator.getInstance().closeSession(c, false);
                 c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
             }
         }