diff --git a/packages/communication/src/messages/parser/inventory/badges/BadgeReceivedParser.ts b/packages/communication/src/messages/parser/inventory/badges/BadgeReceivedParser.ts
index b4b6bcd..41b121a 100644
--- a/packages/communication/src/messages/parser/inventory/badges/BadgeReceivedParser.ts
+++ b/packages/communication/src/messages/parser/inventory/badges/BadgeReceivedParser.ts
@@ -4,11 +4,13 @@ export class BadgeReceivedParser implements IMessageParser
 {
     private _badgeId: number;
     private _badgeCode: string;
+    private _senderName: string;
 
     public flush(): boolean
     {
         this._badgeId = 0;
         this._badgeCode = null;
+        this._senderName = '';
 
         return true;
     }
@@ -19,6 +21,7 @@ export class BadgeReceivedParser implements IMessageParser
 
         this._badgeId = wrapper.readInt();
         this._badgeCode = wrapper.readString();
+        this._senderName = wrapper.bytesAvailable ? wrapper.readString() : '';
 
         return true;
     }
@@ -32,4 +35,9 @@ export class BadgeReceivedParser implements IMessageParser
     {
         return this._badgeCode;
     }
+
+    public get senderName(): string
+    {
+        return this._senderName;
+    }
 }
diff --git a/packages/room/src/RoomPreviewer.ts b/packages/room/src/RoomPreviewer.ts
index 3f49af8..f6d70c7 100644
--- a/packages/room/src/RoomPreviewer.ts
+++ b/packages/room/src/RoomPreviewer.ts
@@ -239,6 +239,8 @@ export class RoomPreviewer
 
         if(this.isRoomEngineReady)
         {
+            if((this._currentPreviewObjectCategory === RoomObjectCategory.FLOOR) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === (extra || ''))) return RoomPreviewer.PREVIEW_OBJECT_ID;
+
             this.reset(false);
 
             this._currentPreviewObjectType = classId;