diff --git a/src/nitro/communication/messages/outgoing/room/data/SaveRoomSettingsComposer.ts b/src/nitro/communication/messages/outgoing/room/data/SaveRoomSettingsComposer.ts
index 72b45056..26470326 100644
--- a/src/nitro/communication/messages/outgoing/room/data/SaveRoomSettingsComposer.ts
+++ b/src/nitro/communication/messages/outgoing/room/data/SaveRoomSettingsComposer.ts
@@ -1,10 +1,15 @@
 import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer';
 
-export class SaveRoomSettingsComposer implements IMessageComposer<ConstructorParameters<typeof SaveRoomSettingsComposer>>
+export class SaveRoomSettingsComposer
+implements
+        IMessageComposer<
+            ConstructorParameters<typeof SaveRoomSettingsComposer>
+        >
 {
     private _data: ConstructorParameters<typeof SaveRoomSettingsComposer>;
 
-    constructor(roomId: number,
+    constructor(
+        roomId: number,
         roomName: string,
         roomDescription: string,
         lockState: number,
@@ -30,16 +35,19 @@ export class SaveRoomSettingsComposer implements IMessageComposer<ConstructorPar
         chatFloodProtection: number
     )
     {
-        this._data = [
+        this._data.push(
             roomId,
             roomName,
             roomDescription,
             lockState,
             password,
             userCount,
-            categoryId,
-            tagsCount,
-            tags,
+            categoryId
+        );
+
+        this._data.push(tags.length, ...tags);
+
+        this._data.push(
             tradeState,
             allowPets,
             allowPetsEat,
@@ -55,7 +63,7 @@ export class SaveRoomSettingsComposer implements IMessageComposer<ConstructorPar
             chatBubbleSpeed,
             chatDistance,
             chatFloodProtection
-        ];
+        );
     }
 
     public getMessageArray()
@@ -67,4 +75,4 @@ export class SaveRoomSettingsComposer implements IMessageComposer<ConstructorPar
     {
         return;
     }
-}
\ No newline at end of file
+}