diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
index d3978d8d..9d42b47e 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
@@ -205,8 +205,11 @@ public class RoomTile {
     }
 
     public boolean hasUnits() {
-        synchronized (this.units) {
-            return this.units.size() > 0;
+        synchronized(this.units) {
+        if (!this.units.isEmpty()) {
+            this.units.removeIf(unit -> !unit.getCurrentLocation().equals(this));
+        }
+        return !this.units.isEmpty();
         }
     }