diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
index e6eb506d..9521a75c 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
@@ -730,6 +730,7 @@ public class RoomUnit {
     }
 
     public void addOverrideTile(RoomTile tile) {
+        if (!this.canOverrideTile(tile)) { return; } // Test if the Tile is overridable
         int tileIndex = (room.getLayout().getMapSizeY() * tile.y) + tile.x + 1;
         if (!this.overridableTiles.contains(tileIndex)) {
             this.overridableTiles.add(tileIndex);