diff --git a/include/columnlynx/common/net/session_registry.hpp b/include/columnlynx/common/net/session_registry.hpp
index 630f088..11449ae 100644
--- a/include/columnlynx/common/net/session_registry.hpp
+++ b/include/columnlynx/common/net/session_registry.hpp
@@ -134,9 +134,9 @@ namespace ColumnLynx::Net {
                 std::unique_lock lock(mMutex);
                 mSessionIPs[sessionID] = ip;
                 
-                if (mIPSessions.find(sessionID) == mIPSessions.end()) {
+                /*if (mIPSessions.find(sessionID) == mIPSessions.end()) {
                     Utils::debug("yikes");
-                }
+                }*/
                 mIPSessions[ip] = mSessions.find(sessionID)->second;
             }
 
diff --git a/src/server/server/net/tcp/tcp_connection.cpp b/src/server/server/net/tcp/tcp_connection.cpp
index db6bfe1..34d7094 100644
--- a/src/server/server/net/tcp/tcp_connection.cpp
+++ b/src/server/server/net/tcp/tcp_connection.cpp
@@ -229,8 +229,6 @@ namespace ColumnLynx::Net::TCP {
                     tunConfig.clientIP = htonl(clientIP); // e.g. 10.10.0.X
                     tunConfig.dns1 = htonl(0x08080808);    // 8.8.8.8
                     tunConfig.dns2 = 0;
-                    
-                    SessionRegistry::getInstance().lockIP(mConnectionSessionID, clientIP);
 
                     uint64_t sessionIDNet = Utils::chtobe64(mConnectionSessionID);
 
@@ -249,6 +247,7 @@ namespace ColumnLynx::Net::TCP {
                     Utils::log("Handshake with " + reqAddr + " completed successfully. Session ID assigned (" + std::to_string(mConnectionSessionID) + ").");
                     auto session = std::make_shared<SessionState>(mConnectionAESKey, std::chrono::hours(12), clientIP, htonl(0x0A0A0001), mConnectionSessionID);
                     SessionRegistry::getInstance().put(mConnectionSessionID, std::move(session));
+                    SessionRegistry::getInstance().lockIP(mConnectionSessionID, clientIP);
 
                 } catch (const std::exception& e) {
                     Utils::error("Failed to decrypt HANDSHAKE_EXCHANGE_KEY from " + reqAddr + ": " + e.what());