diff --git a/src/localstorage/localStorage.ts b/src/localstorage/localStorage.ts
index 75686eb..3296647 100644
--- a/src/localstorage/localStorage.ts
+++ b/src/localstorage/localStorage.ts
@@ -14,10 +14,20 @@ export function setLocalSettings(settings: Settings) {
 }
 
 export function getLocalSettings(): Settings {
+  let name = localStorage.getItem('appName');
+  if (name === undefined || name === 'undefined') {
+    name = appName.value;
+  }
+
+  let db = localStorage.getItem('databaseName');
+  if (db === undefined || db === 'undefined') {
+    db = databaseName.value;
+  }
+
   return <Settings>{
     icon: localStorage.getItem('icon'),
-    appName: localStorage.getItem('appName') || appName.value,
-    databaseName: localStorage.getItem('databaseName') || databaseName.value,
+    appName: name,
+    databaseName: db,
     primaryColor: localStorage.getItem('primaryColor'),
     primaryColorText: localStorage.getItem('primaryColorText'),
     secondaryColor: localStorage.getItem('secondaryColor'),