diff --git a/meteor/client/lib/apputil.js b/meteor/client/lib/apputil.js
index 8ceb1c8133..80bc9b7027 100644
--- a/meteor/client/lib/apputil.js
+++ b/meteor/client/lib/apputil.js
@@ -68,10 +68,11 @@ AppUtil.remove = function (appId) {
   var app = Apps.findOne(appId);
   if (app.docker) {
     Docker.removeContainer(app.docker.Id, function (err) {
-      Apps.remove({_id: appId});
       var appPath = path.join(Util.KITE_PATH, app.name);
       Util.deleteFolder(appPath);
     });
+  } else {
+    Apps.remove({_id: appId});
   }
 };