diff --git a/src/addons.js b/src/addons.js
index 0e4e48f42..642cdf556 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -1835,6 +1835,8 @@ function setupRedis(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    if (app.servicesConfig['redis'].disabled) return appdb.unsetAddonConfig(app.id, 'redis', callback);
+
     const redisName = 'redis-' + app.id;
 
     appdb.getAddonConfigByName(app.id, 'redis', '%REDIS_PASSWORD', function (error, existingPassword) {
@@ -1901,6 +1903,8 @@ function clearRedis(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    if (app.servicesConfig['redis'].disabled) return callback(null);
+
     debugApp(app, 'Clearing redis');
 
     getContainerDetails('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN', function (error, result) {
@@ -1955,6 +1959,8 @@ function restoreRedis(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    if (app.servicesConfig['redis'].disabled) return callback(null);
+
     debugApp(app, 'Restoring redis');
 
     callback = once(callback); // protect from multiple returns with streams