diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 2e0f7702..91bdd885 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -577,6 +577,8 @@ public class RoomManager {
 
         if (habbo.getRoomUnit() != null) {
             habbo.getRoomUnit().setRoom(null);
+            habbo.getRoomUnit().getCurrentLocation().removeUnit(habbo.getRoomUnit());
+            habbo.getRoomUnit().getRoom().sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose());
         }
 
         habbo.setRoomUnit(new RoomUnit());