diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
index 8c5224e1..88b65626 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
@@ -109,8 +109,7 @@ public class PacketsManager {
     public static void setupMainPacketsListener() {
         if (clientInteractEntityListener != null) {
             if (mainListener != null) {
-                // ProtocolLibrary.getProtocolManager().removePacketListener(mainListener);
-                ProtocolLibrary.getProtocolManager().getAsynchronousManager().unregisterAsyncHandler(mainListener);
+                ProtocolLibrary.getProtocolManager().removePacketListener(mainListener);
             }
 
             ArrayList<PacketType> packetsToListen = new ArrayList<>();
@@ -163,9 +162,7 @@ public class PacketsManager {
 
             mainListener = new PacketListenerMain(LibsDisguises.getInstance(), packetsToListen);
 
-            //  ProtocolLibrary.getProtocolManager().addPacketListener(mainListener);
-            ProtocolLibrary.getProtocolManager().getAsynchronousManager().registerAsyncHandler(mainListener)
-                    .syncStart(10, TimeUnit.SECONDS);
+            ProtocolLibrary.getProtocolManager().addPacketListener(mainListener);
         }
     }
 
@@ -174,13 +171,9 @@ public class PacketsManager {
             viewDisguisesListenerEnabled = enabled;
 
             if (viewDisguisesListenerEnabled) {
-                //ProtocolLibrary.getProtocolManager().addPacketListener(viewDisguisesListener);
-                ProtocolLibrary.getProtocolManager().getAsynchronousManager()
-                        .registerAsyncHandler(viewDisguisesListener).syncStart(10, TimeUnit.SECONDS);
+                ProtocolLibrary.getProtocolManager().addPacketListener(viewDisguisesListener);
             } else {
-                ProtocolLibrary.getProtocolManager().getAsynchronousManager()
-                        .unregisterAsyncHandler(viewDisguisesListener);
-                //  ProtocolLibrary.getProtocolManager().removePacketListener(viewDisguisesListener);
+                ProtocolLibrary.getProtocolManager().removePacketListener(viewDisguisesListener);
             }
 
             for (Player player : Bukkit.getOnlinePlayers()) {
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java
index 98cc9a69..8da6f903 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java
@@ -29,8 +29,7 @@ public class PacketListenerMain extends PacketAdapter {
 
         final Player observer = event.getPlayer();
 
-        if (observer == null || observer.getName() == null ||
-                observer.getName().contains("UNKNOWN[")) // If the player is temporary
+        if (observer.getName().contains("UNKNOWN[")) // If the player is temporary
             return;
 
         // First get the entity, the one sending this packet
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerViewSelfDisguise.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerViewSelfDisguise.java
index 36c19ef2..93b20d47 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerViewSelfDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerViewSelfDisguise.java
@@ -40,8 +40,7 @@ public class PacketListenerViewSelfDisguise extends PacketAdapter {
         try {
             final Player observer = event.getPlayer();
 
-            if (observer == null || observer.getName() == null ||
-                    observer.getName().contains("UNKNOWN[")) {// If the player is temporary
+            if (observer.getName().contains("UNKNOWN[")) {// If the player is temporary
                 return;
             }