diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 4eea5fd54e5b3299b6a67e78410ab95b41dfc9ae..6d29a8bb99717807d470d61f8069a82c97ce5757 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -581,12 +581,13 @@ public class Player extends CreeperEntity {
                     })
                     .collect(Collectors.toList());
 
+            final Room originalRoom = currentRoom;
             aggresiveRoomNpcs.forEach(npc -> {
                 gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " has alerted a " + npc.getColorName() + "\r\n");
                 gameManager.getChannelUtils().write(playerId, "You can return to your previous location by typing \"back\"" + "\r\n");
                 setIsActiveAlertNpcStatus();
                 scheduledExecutor.schedule(() -> {
-                    if (!getCurrentRoom().getRoomId().equals(currentRoom.getRoomId())) {
+                    if (!getCurrentRoom().getRoomId().equals(originalRoom.getRoomId())) {
                         return;
                     }
                     gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " has " + Color.BOLD_ON + Color.RED + "ANGERED" + Color.RESET + " a " + npc.getColorName() + "\r\n");
@@ -1143,4 +1144,18 @@ public class Player extends CreeperEntity {
         }
 
     }
+
+    public class DelayNpcAggro implements Runnable {
+
+        private final Room originalRoom;
+
+        public DelayNpcAggro(Room originalRoom) {
+            this.originalRoom = originalRoom;
+        }
+
+        @Override
+        public void run() {
+
+        }
+    }
 }