diff --git a/assets/js/app.js b/assets/js/app.js
index 3be1c37b..5eaaf1d1 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -168,7 +168,7 @@ Hooks.StoreRecentBrainstorming = {
     
     recentBrainstormings[brainstormingId] = {
       id: brainstormingId,
-      admin_url_id: this.el.dataset.adminUrlId,
+      admin_url_id: this.el.dataset.adminUrlId || recentBrainstormings?.brainstormingId?.admin_url_id,
       name: this.el.dataset.name,
       last_accessed_at: this.el.dataset.lastAccessedAt
     }
diff --git a/lib/mindwendel_web/components/layouts.ex b/lib/mindwendel_web/components/layouts.ex
index f49e777e..7539a80e 100644
--- a/lib/mindwendel_web/components/layouts.ex
+++ b/lib/mindwendel_web/components/layouts.ex
@@ -18,6 +18,11 @@ defmodule MindwendelWeb.Layouts do
     Brainstormings.list_brainstormings_for(user.id, limit)
   end
 
+  def brainstorming_url(id, admin_url_id) do
+    admin_url_id = admin_url_id || ""
+    ~p"/brainstormings/#{id}/##{admin_url_id}"
+  end
+
   def admin_view(current_view) do
     current_view == MindwendelWeb.Admin.BrainstormingLive.Edit
   end
diff --git a/lib/mindwendel_web/templates/layout/app.html.heex b/lib/mindwendel_web/templates/layout/app.html.heex
index d4128ec8..24e05dc9 100644
--- a/lib/mindwendel_web/templates/layout/app.html.heex
+++ b/lib/mindwendel_web/templates/layout/app.html.heex
@@ -47,11 +47,14 @@
               {gettext("Your brainstormings")}
             </a>
             <ul class="dropdown-menu">
-              <%= for brainstorming <- assigns[:brainstormings_stored] do %>
+              <%= for brainstorming <- assigns[:brainstormings_stored] || [] do %>
                 <a
                   class={"dropdown-item #{ if assigns[:brainstorming].id == brainstorming["id"], do: "active", else: "" }"}
                   href={
-                    ~p"/brainstormings/#{brainstorming["id"]}/##{brainstorming["admin_url_id"]}"
+                    brainstorming_url(
+                      brainstorming["id"],
+                      get_in(brainstorming, ["admin_url_id"])
+                    )
                   }
                 >
                   {brainstorming["name"]}
@@ -72,12 +75,12 @@
           <% end %>
 
           <li class="nav-item"><hr class="dropdown-divider" /></li>
-          <%= for brainstorming <- assigns[:brainstormings_stored] do %>
+          <%= for brainstorming <- assigns[:brainstormings_stored] || [] do %>
             <li class="nav-item d-lg-none">
               <a
                 class={"nav-link #{if assigns[:brainstorming].id == brainstorming["id"], do: "active", else: "" }"}
                 href={
-                  ~p"/brainstormings/#{brainstorming["id"]}/##{brainstorming["admin_url_id"]}"
+                  brainstorming_url(brainstorming["id"], get_in(brainstorming, ["admin_url_id"]))
                 }
               >
                 {brainstorming["name"]}
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index b06e9552..72e9065a 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -542,13 +542,13 @@ msgid "Your comment"
 msgstr "Kommentar"
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:71
-#: lib/mindwendel_web/templates/layout/app.html.heex:69
+#: lib/mindwendel_web/templates/layout/app.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Legal Disclosure"
 msgstr "Impressum"
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:72
-#: lib/mindwendel_web/templates/layout/app.html.heex:65
+#: lib/mindwendel_web/templates/layout/app.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Privacy"
 msgstr "Datenschutzerklärung"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 1f605370..661d5e62 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -541,13 +541,13 @@ msgid "Your comment"
 msgstr ""
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:71
-#: lib/mindwendel_web/templates/layout/app.html.heex:69
+#: lib/mindwendel_web/templates/layout/app.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Legal Disclosure"
 msgstr ""
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:72
-#: lib/mindwendel_web/templates/layout/app.html.heex:65
+#: lib/mindwendel_web/templates/layout/app.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Privacy"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 4f842571..3fb52749 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -542,13 +542,13 @@ msgid "Your comment"
 msgstr ""
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:71
-#: lib/mindwendel_web/templates/layout/app.html.heex:69
+#: lib/mindwendel_web/templates/layout/app.html.heex:72
 #, elixir-autogen, elixir-format
 msgid "Legal Disclosure"
 msgstr ""
 
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:72
-#: lib/mindwendel_web/templates/layout/app.html.heex:65
+#: lib/mindwendel_web/templates/layout/app.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Privacy"
 msgstr ""