diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index cee4409240d..adb60c7f362 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -912,6 +912,8 @@
                             more: false,
                             results: rs
                         });
+                    }, function () {
+                        q.callback({more: false, results: []});
                     });
                 },
             });
@@ -995,8 +997,8 @@
                     limit: 9,
                     context: website.get_context()
                 },
-            }).done(function () {
-                // request completed successfully -> unstore it
+            }).always(function () {
+                // request completed -> unstore it
                 self.req = null;
             });
         },