diff --git a/src/lib/components/Course/components/Navigation/index.svelte b/src/lib/components/Course/components/Navigation/index.svelte
index d4253df6..33a25a1f 100644
--- a/src/lib/components/Course/components/Navigation/index.svelte
+++ b/src/lib/components/Course/components/Navigation/index.svelte
@@ -59,8 +59,10 @@
   }
 
   onMount(() => {
-    if (localStorage.getItem('hideCourseNav')) {
-      show = localStorage.getItem('hideCourseNav') === 'false';
+    if (browser) {
+      if (localStorage.getItem('hideCourseNav')) {
+        show = localStorage.getItem('hideCourseNav') === 'false';
+      }
     } else {
       show = true;
     }
diff --git a/src/lib/components/Navigation/app.svelte b/src/lib/components/Navigation/app.svelte
index 133dbd27..127459d1 100644
--- a/src/lib/components/Navigation/app.svelte
+++ b/src/lib/components/Navigation/app.svelte
@@ -1,5 +1,6 @@
 <script>
   import { page } from '$app/stores';
+  import { browser } from '$app/environment';
   import NotificationIcon from 'carbon-icons-svelte/lib/Notification.svelte';
   import Moon from 'carbon-icons-svelte/lib/Moon.svelte';
   import Sun from 'carbon-icons-svelte/lib/Sun.svelte';
@@ -14,19 +15,17 @@
     $appStore.isDark = !$appStore.isDark;
 
     toggleBodyByTheme($appStore.isDark);
-    localStorage.setItem('theme', $appStore.isDark ? 'dark' : '');
+
+    if (browser) {
+      localStorage.setItem('theme', $appStore.isDark ? 'dark' : '');
+    }
   }
 </script>
 
 <nav class="{navClass} flex w-full p-2 md:px-6 bg-blue-600">
   <ul class="flex w-full items-center">
     <div class="">
-      <a
-        href={$page.url.pathname}
-        title="Go to ClassroomIO Home"
-        id="logo"
-        class="text-lg"
-      >
+      <a href={$page.url.pathname} title="Go to ClassroomIO Home" id="logo" class="text-lg">
         ClassroomIO
       </a>
     </div>
diff --git a/src/lib/components/Navigation/lms.svelte b/src/lib/components/Navigation/lms.svelte
index 08395a36..9f5f3735 100644
--- a/src/lib/components/Navigation/lms.svelte
+++ b/src/lib/components/Navigation/lms.svelte
@@ -1,5 +1,6 @@
 <script>
   import { page } from '$app/stores';
+  import { browser } from '$app/environment';
   import NotificationIcon from 'carbon-icons-svelte/lib/Notification.svelte';
   import MoonIcon from 'carbon-icons-svelte/lib/Moon.svelte';
   import SunIcon from 'carbon-icons-svelte/lib/Sun.svelte';
@@ -14,19 +15,16 @@
     $appStore.isDark = !$appStore.isDark;
 
     toggleBodyByTheme($appStore.isDark);
-    localStorage.setItem('theme', $appStore.isDark ? 'dark' : '');
+    if (browser) {
+      localStorage.setItem('theme', $appStore.isDark ? 'dark' : '');
+    }
   }
 </script>
 
 <nav class="{navClass} flex w-full p-2 md:px-6 bg-blue-600">
   <ul class="flex w-full items-center">
     <div class="">
-      <a
-        href={$page.url.pathname}
-        title="Go to ClassroomIO Home"
-        id="logo"
-        class="text-lg"
-      >
+      <a href={$page.url.pathname} title="Go to ClassroomIO Home" id="logo" class="text-lg">
         ClassroomIO
       </a>
     </div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7d5cfa68..ca5aca09 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,7 +2,7 @@
   import { onMount } from 'svelte';
   import { derived } from 'svelte/store';
   import { goto } from '$app/navigation';
-  import { dev } from '$app/environment';
+  import { dev, browser } from '$app/environment';
   import { page, navigating } from '$app/stores';
   import isEmpty from 'lodash/isEmpty';
   import * as Sentry from '@sentry/browser';
@@ -171,7 +171,7 @@
   }
 
   function setOrgBasedOnUrl(host) {
-    if (typeof window !== 'undefined') {
+    if (browser) {
       const debug = localStorage.getItem('role') === 'student';
       const matches = host.match(/([a-z0-9]+).*classroomio[.]com/);
       const subdomain = matches?.[1] ?? '';
@@ -243,9 +243,11 @@
       }
     });
 
-    // Update theme - dark or light mode
-    $appStore.isDark = localStorage.getItem('theme') === 'dark';
-    toggleBodyByTheme($appStore.isDark);
+    if (browser) {
+      // Update theme - dark or light mode
+      $appStore.isDark = localStorage.getItem('theme') === 'dark';
+      toggleBodyByTheme($appStore.isDark);
+    }
 
     if ($appStore.isStudentDomain) {
       getCurrentOrg($appStore.siteNameFromDomain);