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 b53ff0687..24e673dc5 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -51,13 +51,11 @@ public final class UserConnection implements ProxiedPlayer
     @NonNull
     private final String name;
     @Getter
-    @NonNull
     private final InitialHandler pendingConnection;
     /*========================================================================*/
     @Getter
-    @NonNull
     @Setter
-    private ServerConnection server = null;
+    private ServerConnection server;
     @Getter
     private final Object switchMutex = new Object();
     @Getter