diff --git a/app/frontend/controllers/address_search_controller.js b/app/frontend/controllers/address_search_controller.js
index 75d9709f4..f0bcf8ec6 100644
--- a/app/frontend/controllers/address_search_controller.js
+++ b/app/frontend/controllers/address_search_controller.js
@@ -3,6 +3,7 @@ import accessibleAutocomplete from 'accessible-autocomplete'
 import 'accessible-autocomplete/dist/accessible-autocomplete.min.css'
 
 const options = []
+let currentQuery = ''
 
 const fetchOptions = async (query, searchUrl) => {
   try {
@@ -52,7 +53,15 @@ export default class extends Controller {
       defaultValue: '',
       selectElement: selectEl,
       minLength: 3,
+      tNoResults: () => {
+        if (currentQuery && currentQuery.trim().length > 2) {
+          return 'No address found'
+        } else {
+          return null
+        }
+      },
       source: (query, populateResults) => {
+        currentQuery = query
         fetchAndPopulateSearchResults(query, populateResults, searchUrl, populateOptions, selectEl)
       },
       autoselect: true,