diff --git a/src/Multiselect.vue b/src/Multiselect.vue
index da1298a..a8152f3 100644
--- a/src/Multiselect.vue
+++ b/src/Multiselect.vue
@@ -94,7 +94,7 @@
     </template>
 
     <!-- Spinner -->
-    <slot v-if="busy" name="spinner">
+    <slot v-if="busy && isActive" name="spinner">
       <span :class="classList.spinner"></span>
     </slot>
 
diff --git a/src/composables/useOptions.js b/src/composables/useOptions.js
index 5278f31..d019e8d 100644
--- a/src/composables/useOptions.js
+++ b/src/composables/useOptions.js
@@ -592,7 +592,7 @@ export default function useOptions (props, context, dep)
         }
 
         options.value(search.value).then((response) => {
-          if (query == search.value) {
+          if (query == search.value || !search.value) {
             ro.value = response
             pointer.value = fo.value.filter(o => o.disabled !== true)[0] || null
             resolving.value = false