diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index b5c3c5abb..6ae424bca 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -342,6 +342,16 @@ public class DownstreamBridge extends PacketHandler
                     out.writeUTF( player.getUUID() );
                 }
             }
+            if ( subChannel.equals( "ServerIP" ) )
+            {
+                ServerInfo info = bungee.getServerInfo( in.readUTF() );
+                if ( info != null )
+                {
+                    out.writeUTF( "ServerIP" );
+                    out.writeUTF( info.getAddress().getAddress().getHostAddress() );
+                    out.writeShort( info.getAddress().getPort() );
+                }
+            }
 
             // Check we haven't set out to null, and we have written data, if so reply back back along the BungeeCord channel
             if ( out != null )