diff --git a/src/app/settings/settings.service.ts b/src/app/settings/settings.service.ts
index 8e965c44e..228c574cf 100644
--- a/src/app/settings/settings.service.ts
+++ b/src/app/settings/settings.service.ts
@@ -255,11 +255,11 @@ export class SettingsService {
     });
   }
 
-  setThemeDarkEnabled(enabled: string) {
-    localStorage.setItem('mifosXThemeDarkEnabled', enabled);
+  setThemeDarkEnabled(enabled: boolean) {
+    localStorage.setItem('mifosXThemeDarkEnabled', JSON.stringify(enabled));
   }
 
-  get themeDarkEnabled() {
+  get themeDarkEnabled(): boolean {
     return JSON.parse(localStorage.getItem('mifosXThemeDarkEnabled'));
   }
 }
diff --git a/src/app/shared/theme-toggle/theme-toggle.component.ts b/src/app/shared/theme-toggle/theme-toggle.component.ts
index b32b285bc..5ab950202 100644
--- a/src/app/shared/theme-toggle/theme-toggle.component.ts
+++ b/src/app/shared/theme-toggle/theme-toggle.component.ts
@@ -24,16 +24,16 @@ export class ThemeToggleComponent implements OnInit, OnChanges {
   ) {}
 
   ngOnInit(): void {
-    this.darkModeOn = this.settingsService.themeDarkEnabled === 'true';
+    this.darkModeOn = !!this.settingsService.themeDarkEnabled;
   }
 
   ngOnChanges(changes: SimpleChanges): void {
-    this.darkModeOn = this.settingsService.themeDarkEnabled === 'true';
+    this.darkModeOn = !!this.settingsService.themeDarkEnabled;
   }
 
   toggleTheme() {
     this.darkModeOn = !this.darkModeOn;
-    this.settingsService.setThemeDarkEnabled(this.darkModeOn ? 'true' : 'false');
+    this.settingsService.setThemeDarkEnabled(this.darkModeOn);
     this.themingService.setDarkMode(this.darkModeOn);
   }
 }
diff --git a/src/app/web-app.component.ts b/src/app/web-app.component.ts
index c7e12ff46..d11079f9d 100644
--- a/src/app/web-app.component.ts
+++ b/src/app/web-app.component.ts
@@ -148,7 +148,7 @@ export class WebAppComponent implements OnInit, OnDestroy {
       this.cssClass = value;
     });
     this.themingService.setInitialDarkMode();
-    this.themingService.setDarkMode(this.settingsService.themeDarkEnabled === 'true');
+    this.themingService.setDarkMode(!!this.settingsService.themeDarkEnabled);
 
     // Setup logger
     if (environment.production) {