diff --git a/app.js b/app.js
index 0ab72e5..e5bf257 100644
--- a/app.js
+++ b/app.js
@@ -172,9 +172,10 @@ async function initialize() {
       hljs.highlightAll();
     });
 
-    document.addEventListener('createGuild', (event) => {
+    document.addEventListener('createGuild', async (event) => {
       const { guildName } = event.detail;
       createGuild(guildName);
+      await joinAllGuilds(); // Ensure the app joins all guilds on startup
     });
 
     document.addEventListener('addRoomToGuild', (event) => {