diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 9a89831c2..9bcfeebc2 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -155,7 +155,10 @@ public class BungeeCord extends ProxyServer
         plugins.mkdir();
         pluginManager.loadPlugins( plugins );
         config.load();
-        reconnectHandler = new YamlReconnectHandler();
+        if ( reconnectHandler == null )
+        {
+            reconnectHandler = new YamlReconnectHandler();
+        }
         isRunning = true;
 
         pluginManager.enablePlugins();