diff --git a/apps/agpsdata/boot.js b/apps/agpsdata/boot.js
index 78caf7858..6415f0b52 100644
--- a/apps/agpsdata/boot.js
+++ b/apps/agpsdata/boot.js
@@ -1,6 +1,6 @@
 (function() {
   let waiting = false;
-  let settings = require("Storage").readJSON("agpsdata.json", 1) || {
+  let settings = require("Storage").readJSON("agpsdata.settings.json", 1) || {
     enabled: true,
     refresh: 1440
   };
diff --git a/apps/agpsdata/lib.js b/apps/agpsdata/lib.js
index f4370e97e..c27ad5db6 100644
--- a/apps/agpsdata/lib.js
+++ b/apps/agpsdata/lib.js
@@ -36,9 +36,10 @@ function CASIC_CHECKSUM(cmd) {
 }
 
 function updateLastUpdate() {
-  let settings = require("Storage").readJSON("agpsdata.json", 1) || {};
-  settings.lastUpdate = Math.round(Date.now());   
-  require("Storage").writeJSON("agpsdata.json", settings)
+  const file = "agpsdata.json";
+  let data = require("Storage").readJSON(file, 1) || {};
+  data.lastUpdate = Math.round(Date.now());
+  require("Storage").writeJSON(file, data);
 }
 
 exports.pull = function(successCallback, failureCallback) {
diff --git a/apps/agpsdata/metadata.json b/apps/agpsdata/metadata.json
index 79f551033..558fcce69 100644
--- a/apps/agpsdata/metadata.json
+++ b/apps/agpsdata/metadata.json
@@ -18,6 +18,7 @@
     {"name":"agpsdata.settings.js","url":"settings.js"}
   ],
   "data": [
-    {"name": "agpsdata.json"}
+    {"name": "agpsdata.json"},
+    {"name": "agpsdata.settings.json"}
   ]
 }
diff --git a/apps/agpsdata/settings.js b/apps/agpsdata/settings.js
index 10e70d15c..9d754e82b 100644
--- a/apps/agpsdata/settings.js
+++ b/apps/agpsdata/settings.js
@@ -1,6 +1,9 @@
 (function(back) {
   function writeSettings(key, value) {
-    var s = require('Storage').readJSON(FILE, true) || {};
+    var s = Object.assign(
+      require('Storage').readJSON("agpsdata.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {}
+    );
     s[key] = value;
     require('Storage').writeJSON(FILE, s);
     readSettings();
@@ -13,7 +16,7 @@
     );
   }
 
-  var FILE="agpsdata.json";
+  var FILE="agpsdata.settings.json";
   var settings;
   readSettings();