diff --git a/src/views/SearchView/SearchView.js b/src/views/SearchView/SearchView.js
index 2730c89da..cae83c4e9 100644
--- a/src/views/SearchView/SearchView.js
+++ b/src/views/SearchView/SearchView.js
@@ -170,8 +170,8 @@ function SearchView() {
     // Check if search query ends with number and fetch data without it.
     // This is for searching addresses with street number in case of no results.
     if (searchQuery && searchQuery.match(/\d$/)) {
-      const newSearchQuery = searchQuery.replace(/\d$/, '');
-      if (newSearchQuery !== searchQuery) {
+      const newSearchQuery = searchQuery.replace(/\d+$/, '');
+      if (newSearchQuery && newSearchQuery !== searchQuery) {
         dispatch(fetchSearchResults({ q: newSearchQuery }));
       }
     }