diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
index 5d54045027..b4cc85b23b 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
@@ -81,6 +81,7 @@ public void disconnect(BaseComponent... reason)
     {
         Preconditions.checkArgument( reason.length == 0, "Server cannot have disconnect reason" );
 
+        isObsolete = true;
         ch.close();
     }
 
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index d735989127..95f6b1566e 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -373,7 +373,6 @@ private void cutThrough(ServerConnection server)
         // Remove from old servers
         if ( user.getServer() != null )
         {
-            user.getServer().setObsolete( true );
             user.getServer().disconnect( "Quitting" );
         }
 
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 41670a1629..54842ca0ee 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -439,7 +439,6 @@ public void disconnect0(final BaseComponent reason)
 
             if ( server != null )
             {
-                server.setObsolete( true );
                 server.disconnect( "Quitting" );
             }
         }