diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
index d3cd98e..126c42c 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
@@ -65,7 +65,7 @@ export class BaseTableComponent<TModel, TApiService extends ApiService<TModel>>
     }
   };
 
-  theme: GuiTheme = localStorage.getItem('theme') === 'dark' ? GuiTheme.DARK : GuiTheme.FABRIC;
+  theme: GuiTheme = typeof window !== 'undefined' ? (localStorage.getItem('theme') === 'dark' ? GuiTheme.DARK : GuiTheme.FABRIC) : GuiTheme.DARK;
 
   private themeSubscription: Subscription = new Subscription();
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
index 7c93e54..5393f59 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
@@ -22,7 +22,6 @@ export class LoginComponent {
   IsPwdHidden: boolean = true;
 
   constructor(private authService: AuthenticationService, @Inject(MAT_DIALOG_DATA) public data: any) {
-    //localStorage.getItem('theme') === 'dark'
     if (typeof (this.afterLogin) == typeof (data.afterLogin))
       this.afterLogin = data.afterLogin;
   }
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
index ac57bb5..700f245 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
@@ -27,7 +27,7 @@ export class NavMenuComponent {
   }
 
   get isDarkTheme(): boolean {
-    return localStorage.getItem('theme') === 'dark'
+    return (typeof window !== 'undefined')?(localStorage.getItem('theme') === 'dark'):true;
   }
 
   collapse() {
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
index b962070..618233e 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
@@ -17,7 +17,8 @@ export class ColorModeService {
   }
 
   setTheme(theme: Theme) {
-    localStorage.setItem('theme', theme)
+    if (typeof window !== 'undefined')
+      localStorage.setItem('theme', theme)
     this.updateTheme();
   }
 
@@ -76,7 +77,7 @@ export const ParseTheme: (value: string) => Theme | undefined = (value: string)
 }
 
 export function GetLocalTheme(): Theme {
-  let sTheme: string | null = localStorage.getItem('theme');
+  let sTheme: string | null = (typeof window !== 'undefined') ? (localStorage.getItem('theme')) : 'dark';
 
   if (sTheme === null)
     return Theme.Dark;