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 89ce654ee8..19ab11479b 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -365,19 +365,17 @@ private void cutThrough(ServerConnection server)
             return;
         }
 
-        if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_2 && !user.getConfiguring().get() )
+        if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_2 )
         {
             if ( user.getServer() != null )
             {
                 // Begin config mode
-                if ( user.getCh().getEncodeProtocol() != Protocol.CONFIGURATION )
+                if ( user.getCh().getDecodeProtocol() != Protocol.CONFIGURATION )
                 {
-                    user.getConfiguring().set( true );
                     user.unsafe().sendPacket( new StartConfiguration() );
                 }
             } else
             {
-                user.getConfiguring().set( true );
                 LoginResult loginProfile = user.getPendingConnection().getLoginProfile();
                 user.unsafe().sendPacket( new LoginSuccess( user.getRewriteId(), user.getName(), ( loginProfile == null ) ? null : loginProfile.getProperties() ) );
                 user.getCh().setEncodeProtocol( Protocol.CONFIGURATION );
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 dc631e6b7d..30b0266c26 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -133,8 +133,6 @@ public final class UserConnection implements ProxiedPlayer
     @Getter
     @Setter
     private String lastCommandTabbed;
-    @Getter
-    private final AtomicBoolean configuring = new AtomicBoolean( false );
     /*========================================================================*/
     @Getter
     private String displayName;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 0e5cfe6b3b..49967de9dd 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -354,7 +354,6 @@ public void handle(StartConfiguration startConfiguration) throws Exception
 
     private void configureServer()
     {
-        con.getConfiguring().set( true );
         ChannelWrapper ch = con.getServer().getCh();
         if ( ch.getDecodeProtocol() == Protocol.LOGIN )
         {
@@ -371,7 +370,6 @@ private void configureServer()
     @Override
     public void handle(FinishConfiguration finishConfiguration) throws Exception
     {
-        con.getConfiguring().set( false );
         con.sendQueuedPackets();
     }