diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
index 7a54bd3fe..81f34a4f7 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
@@ -101,7 +101,9 @@ public class GuidedWaypointProvider implements WaypointProvider {
 
             @EventHandler(ignoreCancelled = true)
             public void onPlayerInteract(PlayerInteractEvent event) {
-                if (!event.getPlayer().equals(player) || event.getAction() == Action.PHYSICAL
+                if (!event.getPlayer().equals(player) || event.getAction() == Action.PHYSICAL 
+                        || event.getAction() == Action.RIGHT_CLICK_ENTITY
+                        || event.getAction() == Action.RIGHT_CLICK_BLOCK
                         || event.getClickedBlock() == null)
                     return;
                 if (event.getPlayer().getWorld() != npc.getEntity().getWorld())