diff --git a/client/js/app_functions.js b/client/js/app_functions.js
index f7a4088..991c514 100644
--- a/client/js/app_functions.js
+++ b/client/js/app_functions.js
@@ -145,10 +145,18 @@ export const clearDataStorage = () => {
 };
 
 export const saveDataStorage  = () => {
+	let name = 'dataStorage_dev';
+
 	if (devMode !== true) {
-		localStorage.setItem('dataStorage', JSON.stringify(dataStorage));
-	} else {
-		localStorage.setItem('dataStorage_dev', JSON.stringify(dataStorage));
+		name = 'dataStorage';
+	}
+	
+	try {
+		localStorage.setItem(name, JSON.stringify(dataStorage));
+	} catch (e) {
+		ConsoleLog("yikes, localstorage full, clear it...")
+		dataStorage.journeys = {};
+		saveDataStorage();
 	}
 };