diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a5de18d6..51d5858b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -28,6 +28,11 @@ export class AppComponent implements OnInit {
         this.electronService.ipcRenderer.send('settings.changed', settings);
       });
     }
-    this.themeService.setDarkMode(true);
+    let theme = localStorage.getItem('theme');
+    if (theme === 'light') {
+      this.themeService.setDarkMode(false);
+    } else {
+      this.themeService.setDarkMode(true);
+    }
   }
 }
diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts
index 6a88c6aa..3d7be969 100644
--- a/src/app/components/settings/settings.component.ts
+++ b/src/app/components/settings/settings.component.ts
@@ -32,6 +32,5 @@ export class SettingsComponent implements OnInit {
 
   setDarkMode(value: boolean) {
     this.themeService.setDarkMode(value);
-    //this value should be saved and stored in local memory
   }
 }
diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
index 3afa4682..e7869ba2 100644
--- a/src/app/services/theme.service.ts
+++ b/src/app/services/theme.service.ts
@@ -41,12 +41,15 @@ export class ThemeService {
 
   setDarkMode(value: boolean) {
     this._darkMode$.next(value);
+    localStorage.removeItem('theme');
     if (value) {
       this.savedTheme = 'dark';
       this.themeChanged.emit(this.savedTheme);
+      localStorage.setItem('theme', 'dark');
     } else {
       this.savedTheme = 'light';
       this.themeChanged.emit(this.savedTheme);
+      localStorage.setItem('theme', 'light');
     }
   }