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 1310adae..5a4cc439 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
@@ -149,7 +149,16 @@ public class DownstreamBridge extends PacketHandler
         }
 
         // Create or get old team
-        Team t = ( team.mode == 0 ) ? new Team( team.name ) : con.serverSentScoreboard.getTeam( team.name );
+        Team t;
+        if ( team.mode == 0 )
+        {
+            t = new Team( team.name );
+            con.serverSentScoreboard.addTeam( team );
+        } else
+        {
+            con.serverSentScoreboard.getTeam( team.name );
+        }
+        
         if ( t != null )
         {
             if ( team.mode == 0 || team.mode == 2 )