diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java
index 3b6bbcef..086621a2 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java
@@ -74,7 +74,7 @@ public class PacketListenerSounds extends PacketAdapter {
                 disguisedEntity = entity;
                 soundGroup = SoundGroup.getGroup(entity.getType().name());
 
-                if (soundGroup.getSound(soundEffectObj) == null) {
+                if (soundGroup == null || soundGroup.getSound(soundEffectObj) == null) {
                     return;
                 }
 
@@ -95,12 +95,6 @@ public class PacketListenerSounds extends PacketAdapter {
             return;
         }
 
-        // Blocks null and CANCEL, HURT and DEATH are 100% handled by entity status!
-        if (soundType != SoundType.STEP && soundType != SoundType.IDLE) {
-            //event.setCancelled(true);
-            // return;
-        }
-
         if (disguisedEntity == observer && !disguise.isSelfDisguiseSoundsReplaced()) {
             return;
         }