diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UpdateFurniturePositionEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UpdateFurniturePositionEvent.java
index 2a29f28e..ee0b9ae0 100644
--- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UpdateFurniturePositionEvent.java
+++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UpdateFurniturePositionEvent.java
@@ -5,6 +5,9 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
+import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
+import com.eu.habbo.messages.outgoing.rooms.items.FloorItemUpdateComposer;
 
 public class UpdateFurniturePositionEvent extends MessageHandler {
     @Override
@@ -24,11 +27,17 @@ public class UpdateFurniturePositionEvent extends MessageHandler {
         RoomTile tile = room.getLayout().getTile((short) x, (short) y);
         if (tile == null) return;
 
-        FurnitureMovementError result =
-                room.moveFurniTo(item, tile, rotation, z, this.client.getHabbo(), true, true);
-
-        if (result != FurnitureMovementError.NONE) {
+        FurnitureMovementError error = room.canPlaceFurnitureAt(item, this.client.getHabbo(), tile, rotation);
+        if (error != FurnitureMovementError.NONE) {
+            this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FURNITURE_PLACEMENT_ERROR.key, error.errorCode));
+            this.client.sendResponse(new FloorItemUpdateComposer(item));
             return;
         }
+
+        error = room.moveFurniTo(item, tile, rotation, z, this.client.getHabbo(), true, true);
+        if (error != FurnitureMovementError.NONE) {
+            this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FURNITURE_PLACEMENT_ERROR.key, error.errorCode));
+            this.client.sendResponse(new FloorItemUpdateComposer(item));
+        }
     }
 }
diff --git a/Latest_Compiled_Version/Habbo-4.0.5-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-4.0.5-jar-with-dependencies.jar
index 55283556..ea67a3ba 100644
Binary files a/Latest_Compiled_Version/Habbo-4.0.5-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-4.0.5-jar-with-dependencies.jar differ