diff --git a/src/addons.js b/src/addons.js
index 96f4674e4..0841fb4c4 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -751,7 +751,10 @@ function teardownLocalStorage(app, options, callback) {
 
     debugApp(app, 'teardownLocalStorage');
 
-    docker.removeVolume(app, `${app.id}-localstorage`, callback);
+    async.series([
+        docker.clearVolume.bind(null, app, `${app.id}-localstorage`),
+        docker.removeVolume.bind(null, app, `${app.id}-localstorage`)
+    ], callback);
 }
 
 function setupOauth(app, options, callback) {
diff --git a/src/docker.js b/src/docker.js
index cfc784d87..0c5a4ed40 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -571,14 +571,10 @@ function removeVolume(app, name, callback) {
 
     let docker = exports.connection;
 
-    clearVolume(app, name, function (error) {
-        if (error) return callback(error);
+    let volume = docker.getVolume(name);
+    volume.remove(function (error) {
+        if (error && error.statusCode !== 404) return callback(new Error(`removeVolume: Error removing volume of ${app.id} ${error.message}`));
 
-        let volume = docker.getVolume(name);
-        volume.remove(function (error) {
-            if (error && error.statusCode !== 404) return callback(new Error(`removeVolume: Error removing volume of ${app.id} ${error.message}`));
-
-            callback();
-        });
+        callback();
     });
 }