diff --git a/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java b/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
index 1fc23738..d7566702 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
@@ -496,6 +496,21 @@ public class DisguiseListener implements Listener {
         interactions.remove(p.getName()).onInteract(p, entity);
     }
 
+    @EventHandler
+    public void onRightClick(PlayerInteractAtEntityEvent event) {
+        Player p = event.getPlayer();
+
+        if (!interactions.containsKey(p.getName())) {
+            return;
+        }
+
+        event.setCancelled(true);
+        disguiseRunnable.remove(p.getName()).cancel();
+
+        Entity entity = event.getRightClicked();
+        interactions.remove(p.getName()).onInteract(p, entity);
+    }
+
     @EventHandler
     public void onTarget(EntityTargetEvent event) {
         if (event.getTarget() == null) {