diff --git a/back/src/Services/SocketManager.ts b/back/src/Services/SocketManager.ts
index 43af48e4..a7a10f5f 100644
--- a/back/src/Services/SocketManager.ts
+++ b/back/src/Services/SocketManager.ts
@@ -268,31 +268,29 @@ export class SocketManager {
         //check and create new room
         let roomPromise = this.roomsPromises.get(roomId);
         if (roomPromise === undefined) {
-            roomPromise = new Promise<GameRoom>((resolve, reject) => {
-                GameRoom.create(
-                    roomId,
-                    (user: User, group: Group) => this.joinWebRtcRoom(user, group),
-                    (user: User, group: Group) => this.disConnectedUser(user, group),
-                    MINIMUM_DISTANCE,
-                    GROUP_RADIUS,
-                    (thing: Movable, fromZone: Zone | null, listener: ZoneSocket) =>
-                        this.onZoneEnter(thing, fromZone, listener),
-                    (thing: Movable, position: PositionInterface, listener: ZoneSocket) =>
-                        this.onClientMove(thing, position, listener),
-                    (thing: Movable, newZone: Zone | null, listener: ZoneSocket) =>
-                        this.onClientLeave(thing, newZone, listener),
-                    (emoteEventMessage: EmoteEventMessage, listener: ZoneSocket) =>
-                        this.onEmote(emoteEventMessage, listener)
-                )
-                    .then((gameRoom) => {
-                        gaugeManager.incNbRoomGauge();
-                        resolve(gameRoom);
-                    })
-                    .catch((e) => {
-                        this.roomsPromises.delete(roomId);
-                        reject(e);
-                    });
-            });
+            roomPromise = GameRoom.create(
+                roomId,
+                (user: User, group: Group) => this.joinWebRtcRoom(user, group),
+                (user: User, group: Group) => this.disConnectedUser(user, group),
+                MINIMUM_DISTANCE,
+                GROUP_RADIUS,
+                (thing: Movable, fromZone: Zone | null, listener: ZoneSocket) =>
+                    this.onZoneEnter(thing, fromZone, listener),
+                (thing: Movable, position: PositionInterface, listener: ZoneSocket) =>
+                    this.onClientMove(thing, position, listener),
+                (thing: Movable, newZone: Zone | null, listener: ZoneSocket) =>
+                    this.onClientLeave(thing, newZone, listener),
+                (emoteEventMessage: EmoteEventMessage, listener: ZoneSocket) =>
+                    this.onEmote(emoteEventMessage, listener)
+            )
+                .then((gameRoom) => {
+                    gaugeManager.incNbRoomGauge();
+                    return gameRoom;
+                })
+                .catch((e) => {
+                    this.roomsPromises.delete(roomId);
+                    throw e;
+                });
             this.roomsPromises.set(roomId, roomPromise);
         }
         return roomPromise;
diff --git a/front/src/iframe_api.ts b/front/src/iframe_api.ts
index 2bf1185b..2bef9d1b 100644
--- a/front/src/iframe_api.ts
+++ b/front/src/iframe_api.ts
@@ -1,7 +1,9 @@
 import { registeredCallbacks } from "./Api/iframe/registeredCallbacks";
 import {
     IframeResponseEvent,
-    IframeResponseEventMap, isIframeAnswerEvent, isIframeErrorAnswerEvent,
+    IframeResponseEventMap,
+    isIframeAnswerEvent,
+    isIframeErrorAnswerEvent,
     isIframeResponseEventWrapper,
     TypedMessageEvent,
 } from "./Api/Events/IframeEvent";
@@ -11,28 +13,25 @@ import nav from "./Api/iframe/nav";
 import controls from "./Api/iframe/controls";
 import ui from "./Api/iframe/ui";
 import sound from "./Api/iframe/sound";
-import room, {setMapURL, setRoomId} from "./Api/iframe/room";
-import state, {initVariables} from "./Api/iframe/state";
-import player, {setPlayerName, setTags, setUuid} from "./Api/iframe/player";
+import room, { setMapURL, setRoomId } from "./Api/iframe/room";
+import state, { initVariables } from "./Api/iframe/state";
+import player, { setPlayerName, setTags, setUuid } from "./Api/iframe/player";
 import type { ButtonDescriptor } from "./Api/iframe/Ui/ButtonDescriptor";
 import type { Popup } from "./Api/iframe/Ui/Popup";
 import type { Sound } from "./Api/iframe/Sound/Sound";
-import {answerPromises, queryWorkadventure, sendToWorkadventure} from "./Api/iframe/IframeApiContribution";
+import { answerPromises, queryWorkadventure, sendToWorkadventure } from "./Api/iframe/IframeApiContribution";
 
-const initPromise = new Promise<void>((resolve) => {
 // Notify WorkAdventure that we are ready to receive data
-    queryWorkadventure({
-        type: 'getState',
-        data: undefined
-    }).then((state => {
-        setPlayerName(state.nickname);
-        setRoomId(state.roomId);
-        setMapURL(state.mapUrl);
-        setTags(state.tags);
-        setUuid(state.uuid);
-        initVariables(state.variables as Map<string, unknown>);
-        resolve();
-    }));
+const initPromise = queryWorkadventure({
+    type: "getState",
+    data: undefined,
+}).then((state) => {
+    setPlayerName(state.nickname);
+    setRoomId(state.roomId);
+    setMapURL(state.mapUrl);
+    setTags(state.tags);
+    setUuid(state.uuid);
+    initVariables(state.variables as Map<string, unknown>);
 });
 
 const wa = {
@@ -186,38 +185,39 @@ declare global {
 window.WA = wa;
 
 window.addEventListener(
-    "message", <T extends keyof IframeResponseEventMap>(message: TypedMessageEvent<IframeResponseEvent<T>>) => {
-    if (message.source !== window.parent) {
-        return; // Skip message in this event listener
-    }
-    const payload = message.data;
-
-    //console.debug(payload);
-
-    if (isIframeErrorAnswerEvent(payload)) {
-        const queryId = payload.id;
-        const payloadError = payload.error;
-
-        const resolver = answerPromises.get(queryId);
-        if (resolver === undefined) {
-            throw new Error('In Iframe API, got an error answer for a question that we have no track of.');
+    "message",
+    <T extends keyof IframeResponseEventMap>(message: TypedMessageEvent<IframeResponseEvent<T>>) => {
+        if (message.source !== window.parent) {
+            return; // Skip message in this event listener
         }
-        resolver.reject(new Error(payloadError));
+        const payload = message.data;
 
-        answerPromises.delete(queryId);
-    } else if (isIframeAnswerEvent(payload)) {
-        const queryId = payload.id;
-        const payloadData = payload.data;
+        //console.debug(payload);
 
-        const resolver = answerPromises.get(queryId);
-        if (resolver === undefined) {
-            throw new Error('In Iframe API, got an answer for a question that we have no track of.');
-        }
-        resolver.resolve(payloadData);
+        if (isIframeErrorAnswerEvent(payload)) {
+            const queryId = payload.id;
+            const payloadError = payload.error;
 
-        answerPromises.delete(queryId);
-    } else if (isIframeResponseEventWrapper(payload)) {
-        const payloadData = payload.data;
+            const resolver = answerPromises.get(queryId);
+            if (resolver === undefined) {
+                throw new Error("In Iframe API, got an error answer for a question that we have no track of.");
+            }
+            resolver.reject(new Error(payloadError));
+
+            answerPromises.delete(queryId);
+        } else if (isIframeAnswerEvent(payload)) {
+            const queryId = payload.id;
+            const payloadData = payload.data;
+
+            const resolver = answerPromises.get(queryId);
+            if (resolver === undefined) {
+                throw new Error("In Iframe API, got an answer for a question that we have no track of.");
+            }
+            resolver.resolve(payloadData);
+
+            answerPromises.delete(queryId);
+        } else if (isIframeResponseEventWrapper(payload)) {
+            const payloadData = payload.data;
 
             const callback = registeredCallbacks[payload.type] as IframeCallback<T> | undefined;
             if (callback?.typeChecker(payloadData)) {