diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 3a031afd75a..435ccd3339e 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -393,7 +393,7 @@ class Website(models.Model):
         client_themes = Module.search(domain).mapped('name')
         client_themes_img = {t: get_manifest(t).get('images_preview_theme', {}) for t in client_themes if get_manifest(t)}
         themes_suggested = self._website_api_rpc(
-            '/api/website/2/configurator/recommended_themes/%s' % industry_id,
+            '/api/website/2/configurator/recommended_themes/%s' % (industry_id if industry_id > 0 else ''),
             {'client_themes': client_themes_img}
         )
         process_svg = self.env['website.configurator.feature']._process_svg
@@ -644,9 +644,10 @@ class Website(models.Model):
                 logger.warning(e)
 
         # Load suggestion from iap for selected pages
+        industry_id = kwargs['industry_id']
         custom_resources = self._website_api_rpc(
-            '/api/website/2/configurator/custom_resources/%s' % kwargs['industry_id'],
-            {'theme': theme_name, }
+            '/api/website/2/configurator/custom_resources/%s' % (industry_id if industry_id > 0 else ''),
+            {'theme': theme_name}
         )
 
         # Update pages
diff --git a/addons/website/static/src/client_actions/configurator/configurator.js b/addons/website/static/src/client_actions/configurator/configurator.js
index 6ff0a15cd05..6f35c252d01 100644
--- a/addons/website/static/src/client_actions/configurator/configurator.js
+++ b/addons/website/static/src/client_actions/configurator/configurator.js
@@ -123,9 +123,8 @@ class DescriptionScreen extends Component {
     _setSelectedIndustry(label) {
         this.industrySelection.el.parentNode.dataset.value = label;
         if (!this.autocompleteHasResults) {
-            // If no industry has been found, the first one is chosen by
-            // default to continue the website configuration.
-            this.state.selectIndustry(label, 1);
+            // Unknown industry.
+            this.state.selectIndustry(label, -1);
         } else {
             const id = this.labelToId[label];
             this.state.selectIndustry(label, id);