diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
index fc40d476..0647bf0b 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -186,7 +186,7 @@ public abstract class Disguise {
                     DisguiseAPI.undisguiseToAll(getEntity());
                 } else {
                     // If the disguise type is tnt, we need to resend the entity packet else it will turn invisible
-                    if (getType() == DisguiseType.PRIMED_TNT) {
+                    if (getType() == DisguiseType.PRIMED_TNT || getType() == DisguiseType.FIREWORK) {
                         i++;
                         if (i % 40 == 0) {
                             i = 0;
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 597830d0..d210a31f 100644
--- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -75,9 +75,9 @@ public class DisguiseUtilities {
                                     d.unsetViewDisguise(name);
                                 }
                             } else {
-                                for (String playername : new ArrayList<String>(d.getObservers())) {
+                                for (String playername : d.getObservers()) {
                                     if (!disguise.getObservers().contains(playername)) {
-                                        d.unsetViewDisguise(playername);
+                                        d.silentlyUnsetViewDisguise(playername);
                                     }
                                 }
                             }