diff --git a/server/lib/prosody/config/content.ts b/server/lib/prosody/config/content.ts
index e663f124..43ec98de 100644
--- a/server/lib/prosody/config/content.ts
+++ b/server/lib/prosody/config/content.ts
@@ -190,6 +190,8 @@ class ProsodyConfigContent {
     this.anon.set('http_external_url', 'http://' + prosodyDomain)
 
     this.muc.set('restrict_room_creation', 'local')
+    this.muc.set('http_host', prosodyDomain)
+    this.muc.set('http_external_url', 'http://' + prosodyDomain)
 
     if (this.authenticated) {
       this.authenticated.set('trusted_proxies', ['127.0.0.1', '::1'])
diff --git a/server/lib/routers/webchat.ts b/server/lib/routers/webchat.ts
index ad136bb7..8b67417d 100644
--- a/server/lib/routers/webchat.ts
+++ b/server/lib/routers/webchat.ts
@@ -127,10 +127,7 @@ async function initWebchatRouter (options: RegisterServerOptions): Promise<Route
       if (!prosodyPort) {
         throw new Error('It seems that prosody is not binded... Cant list rooms.')
       }
-      // FIXME: can the api be on http://localhost instead of http://room.localhost?
-      //   This won't work on production servers.
-      peertubeHelpers.logger.error('FIXME: the prosody url should be fixed before releasing this.')
-      const apiUrl = `http://room.localhost:${prosodyPort}/peertubelivechat_list_rooms/list-rooms`
+      const apiUrl = `http://localhost:${prosodyPort}/peertubelivechat_list_rooms/list-rooms`
       peertubeHelpers.logger.debug('Calling list rooms API on url: ' + apiUrl)
       const rooms = await got(apiUrl, {
         method: 'GET',