diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeTablistPacketAdapter.java b/src/main/java/fr/xephi/authme/listener/AuthMeTablistPacketAdapter.java
index d85a5c5e9..8c0001fed 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeTablistPacketAdapter.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeTablistPacketAdapter.java
@@ -30,10 +30,15 @@ public class AuthMeTablistPacketAdapter extends PacketAdapter {
     }
 
     public void register() {
-        ProtocolLibrary.getProtocolManager().addPacketListener(this);
+        // TODO:
+        // FIXME:
+        // This listener hides every player not only from the tablist... From everything! (Invisible players issue)
+        // WE NEED ALSO TO RESEND THE DATA AFTER THE PLAYER LOGIN
+        ConsoleLogger.info("The HideTablistBeforeLogin feature is currently unavariable due to stability issues!");
+        //ProtocolLibrary.getProtocolManager().addPacketListener(this);
     }
 
     public void unregister() {
-        ProtocolLibrary.getProtocolManager().removePacketListener(this);
+        //ProtocolLibrary.getProtocolManager().removePacketListener(this);
     }
 }