diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java
index 2b3854b8..466f971e 100644
--- a/src/de/steamwar/bungeecore/BungeeCore.java
+++ b/src/de/steamwar/bungeecore/BungeeCore.java
@@ -80,10 +80,10 @@ public class BungeeCore extends Plugin {
         new ConnectionListener();
         new Forge();
         new LabyMod();
-        new Fabric();
         new ChatListener();
         new BanListener();
         new CheckListener();
+        new Fabric();
 
         commands.put("/b", null);
         commands.put("/gs", null);
diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index b108be17..e492c039 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -1,6 +1,6 @@
-/* 
+/*
     This file is a part of the SteamWar software.
-    
+
     Copyright (C) 2020  SteamWar.de-Serverteam
 
     This program is free software: you can redistribute it and/or modify
@@ -15,15 +15,20 @@
 
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ */
 
 package de.steamwar.bungeecore.listeners.mods;
 
 import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Servertype;
+import de.steamwar.bungeecore.Storage;
+import de.steamwar.bungeecore.Subserver;
 import de.steamwar.bungeecore.listeners.BasicListener;
 import net.md_5.bungee.api.connection.Connection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerSwitchEvent;
 import net.md_5.bungee.event.EventHandler;
 
 public class Fabric extends BasicListener {
@@ -39,7 +44,23 @@ public class Fabric extends BasicListener {
 
         if(new String(e.getData()).contains("fabric")){
             ProxiedPlayer p = (ProxiedPlayer) sender;
-            p.disconnect(BungeeCore.stringToText("§7Die Verwendung von Fabric ist auf §eSteam§8War §7nicht gestattet."));
+            Storage.fabricPlayers.add(p);
+            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du hast Fabric installiert. Mit Fabric kannst du nicht auf die Arenen");
+        }
+    }
+
+    @EventHandler
+    public void onDisconnect(PlayerDisconnectEvent e){
+        Storage.fabricPlayers.removeIf(player -> player == e.getPlayer());
+    }
+
+    @EventHandler
+    public void onServerSwitch(ServerSwitchEvent event) {
+        if(Subserver.getSubserver(event.getPlayer()) != null
+                && Subserver.getSubserver(event.getPlayer()).getType() == Servertype.ARENA
+                && Storage.fabricPlayers.contains(event.getPlayer())) {
+            event.getPlayer().connect(event.getFrom());
+            BungeeCore.send(event.getPlayer(), BungeeCore.CHAT_PREFIX + "§cDu kannst nicht auf die Arena mit Fabric");
         }
     }
 }