diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select.hbs
index 2e1aa9af9cf..540afd850d5 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select.hbs
@@ -42,7 +42,7 @@
     {{/each}}
 
     {{#if this.selectKit.filter}}
-      {{#if this.selectKit.hasNoContent}}
+      {{#if (and this.selectKit.hasNoContent (not this.selectKit.isLoading))}}
         <span class="no-content" role="alert">
           {{i18n "select_kit.no_content"}}
         </span>
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/components/single-select.hbs
index c4d684d817d..d77c7852b8a 100644
--- a/app/assets/javascripts/select-kit/addon/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/single-select.hbs
@@ -28,7 +28,7 @@
     {{/each}}
 
     {{#if this.selectKit.filter}}
-      {{#if this.selectKit.hasNoContent}}
+      {{#if (and this.selectKit.hasNoContent (not this.selectKit.isLoading))}}
         <span class="no-content" role="alert">
           {{i18n "select_kit.no_content"}}
         </span>