diff --git a/appstore.js b/appstore.js
index dd2e183..a7f9e72 100644
--- a/appstore.js
+++ b/appstore.js
@@ -128,7 +128,7 @@ AppStore.prototype.deleteCloudron = function (box) {
    common. verifyResponse(res, 'Could not delete cloudron');
 
     process.stdout.write('Waiting for Cloudron to disappear.');
-    while (true) {
+    for (var i = 0; i < 40; i++)  {
         if (this.getCloudron(box.id) === null) break;
 
         sleep(10);