diff --git a/src/settings.js b/src/settings.js
index 6e376e4b5..0d739d4d8 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -87,6 +87,7 @@ var gDefaults = (function () {
     result[exports.TIME_ZONE_KEY] = 'America/Los_Angeles';
     result[exports.CLOUDRON_NAME_KEY] = 'Cloudron';
     result[exports.DYNAMIC_DNS_KEY] = false;
+    result[exports.UNSTABLE_APPS_KEY] = false;
     result[exports.BACKUP_CONFIG_KEY] = {
         provider: 'filesystem',
         key: '',
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index f6badd975..f6714c102 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -132,6 +132,26 @@ describe('Settings', function () {
             });
         });
 
+        it('can get default unstable apps setting', function (done) {
+            settings.getUnstableAppsConfig(function (error, enabled) {
+                expect(error).to.be(null);
+                expect(enabled).to.be(false);
+                done();
+            });
+        });
+
+        it('can set unstable apps setting', function (done) {
+            settings.setUnstableAppsConfig(true, function (error) {
+                expect(error).to.be(null);
+
+                settings.getUnstableAppsConfig(function (error, enabled) {
+                    expect(error).to.be(null);
+                    expect(enabled).to.be(true);
+                    done();
+                });
+            });
+        });
+
         it('can get all values', function (done) {
             settings.getAll(function (error, allSettings) {
                 expect(error).to.be(null);
@@ -139,6 +159,7 @@ describe('Settings', function () {
                 expect(allSettings[settings.APP_AUTOUPDATE_PATTERN_KEY]).to.be.a('string');
                 expect(allSettings[settings.BOX_AUTOUPDATE_PATTERN_KEY]).to.be.a('string');
                 expect(allSettings[settings.CLOUDRON_NAME_KEY]).to.be.a('string');
+                expect(allSettings[settings.UNSTABLE_APPS_KEY]).to.be.a('boolean');
                 done();
             });
         });