diff --git a/apps/server/src/assets/views/set_password.ejs b/apps/server/src/assets/views/set_password.ejs
index 56d4ef1118..2610716474 100644
--- a/apps/server/src/assets/views/set_password.ejs
+++ b/apps/server/src/assets/views/set_password.ejs
@@ -10,6 +10,12 @@
     <link rel="stylesheet" href="<%= assetPath %>/stylesheets/theme-next.css">
     <link rel="stylesheet" href="<%= assetPath %>/stylesheets/style.css">
     <script src="<%= appPath %>/runtime.js" crossorigin type="module"></script>
+    <style>
+        body {
+            /* Prevent the content from being rendered before the main stylesheet loads */
+            display: none;
+        }
+    </style>
 </head>
 <body lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>">
 <div class="container set-password">
diff --git a/apps/server/src/assets/views/setup.ejs b/apps/server/src/assets/views/setup.ejs
index 8695426447..68ee58b517 100644
--- a/apps/server/src/assets/views/setup.ejs
+++ b/apps/server/src/assets/views/setup.ejs
@@ -7,6 +7,10 @@
     <title><%= t("setup.title") %></title>
 
     <style>
+        body {
+            /* Prevent the content from being rendered before the main stylesheet loads */
+            display: none;
+        }
         .lds-ring {
             display: inline-block;
             position: relative;