diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 9615e9c3cec..eb88d62632e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -23,9 +23,7 @@
 	</head>
 	<body id="body-public" class="layout-base">
 		<?php include 'layout.noscript.warning.php'; ?>
-		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
-			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
-		<?php }?>
+		<?php include 'layout.initial-state.php'; ?>
 		<div id="content" class="app-public" role="main">
 			<?php print_unescaped($_['content']); ?>
 		</div>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 3fd11dcc2b9..be0c36d6c53 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -34,9 +34,7 @@ p($theme->getTitle());
 	</head>
 	<body id="<?php p($_['bodyid']);?>">
 		<?php include 'layout.noscript.warning.php'; ?>
-		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
-			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
-		<?php }?>
+		<?php include 'layout.initial-state.php'; ?>
 		<div class="wrapper">
 			<div class="v-align">
 				<?php if ($_['bodyid'] === 'body-login'): ?>
diff --git a/core/templates/layout.initial-state.php b/core/templates/layout.initial-state.php
new file mode 100644
index 00000000000..23c9be1a9c4
--- /dev/null
+++ b/core/templates/layout.initial-state.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+?>
+<div id="initial-state-container" style="display: none;">
+    <?php foreach ($_['initialStates'] as $app => $initialState) { ?>
+        <input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
+    <?php }?>
+</div>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 350bfee244d..b228801190c 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -33,10 +33,8 @@ p($theme->getTitle());
 	<?php print_unescaped($_['headers']); ?>
 </head>
 <body id="<?php p($_['bodyid']);?>">
-<?php include('layout.noscript.warning.php'); ?>
-<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
-	<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
-<?php }?>
+	<?php include('layout.noscript.warning.php'); ?>
+	<?php include('layout.initial-state.php'); ?>
 	<div id="skip-actions">
 		<?php if ($_['id-app-content'] !== null) { ?><a href="<?php p($_['id-app-content']); ?>" class="button primary skip-navigation skip-content"><?php p($l->t('Skip to main content')); ?></a><?php } ?>
 		<?php if ($_['id-app-navigation'] !== null) { ?><a href="<?php p($_['id-app-navigation']); ?>" class="button primary skip-navigation"><?php p($l->t('Skip to navigation of app')); ?></a><?php } ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f590918301b..475d1b89a0f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -51,11 +51,8 @@ p($theme->getTitle());
 	<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
 		p("data-theme-$themeId ");
 	}?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>>
-	<?php include 'layout.noscript.warning.php'; ?>
-
-		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
-			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
-		<?php }?>
+		<?php include 'layout.noscript.warning.php'; ?>
+		<?php include 'layout.initial-state.php'; ?>
 
 		<div id="skip-actions">
 			<?php if ($_['id-app-content'] !== null) { ?><a href="<?php p($_['id-app-content']); ?>" class="button primary skip-navigation skip-content"><?php p($l->t('Skip to main content')); ?></a><?php } ?>
