diff --git a/app/javascript/shared/autocomplete.js b/app/javascript/shared/autocomplete.js
index 985862d59..db9db0180 100644
--- a/app/javascript/shared/autocomplete.js
+++ b/app/javascript/shared/autocomplete.js
@@ -48,9 +48,8 @@ addEventListener('ajax:success', function() {
 function autocompleteSetup() {
   for (let { type, url } of sources) {
     for (let element of document.querySelectorAll(selector(type))) {
-      if (!element.dataset.autocompleteInitialized) {
-        autocompleteInitializeElement(element, url);
-      }
+      element.removeAttribute('data-autocomplete');
+      autocompleteInitializeElement(element, url);
     }
   }
 }
@@ -61,5 +60,4 @@ function autocompleteInitializeElement(element, url) {
     fire(target, 'autocomplete:select', suggestion);
     select.autocomplete.setVal(suggestion.label);
   });
-  element.dataset.autocompleteInitialized = true;
 }