diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index bd970ce06..0b0c4801e 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -89,18 +89,19 @@ export default {
     onInputSearch(event) {
       const newQuery = event.target.value;
       const refetchAllContacts = !!this.searchQuery && newQuery === '';
-
       if (refetchAllContacts) {
         this.$store.dispatch('contacts/get', { page: 1 });
       }
-      this.searchQuery = event.target.value;
+      this.searchQuery = newQuery;
     },
     onSearchSubmit() {
       this.selectedContactId = '';
-      this.$store.dispatch('contacts/search', {
-        search: this.searchQuery,
-        page: 1,
-      });
+      if (this.searchQuery) {
+        this.$store.dispatch('contacts/search', {
+          search: this.searchQuery,
+          page: 1,
+        });
+      }
     },
     onPageChange(page) {
       this.selectedContactId = '';