diff --git a/web/templates/giphy_picker.hbs b/web/templates/giphy_picker.hbs
index f532188d7e..18ab6f2fbe 100644
--- a/web/templates/giphy_picker.hbs
+++ b/web/templates/giphy_picker.hbs
@@ -2,7 +2,7 @@
     <div class="arrow"></div>
     <div class="popover-inner">
         <div class="popover-filter-input-wrapper">
-            <input type="text" id="giphy-search-query" class="popover-filter-input filter_text_input" placeholder="{{t 'Filter' }}" autofocus/>
+            <input type="text" id="giphy-search-query" class="popover-filter-input filter_text_input" autocomplete="off" placeholder="{{t 'Filter' }}" autofocus/>
         </div>
         <div class="giphy-scrolling-container" data-simplebar data-simplebar-tab-index="-1">
             {{! We need a container we can replace
diff --git a/web/templates/popovers/emoji/emoji_popover.hbs b/web/templates/popovers/emoji/emoji_popover.hbs
index eb36585c54..da5184f908 100644
--- a/web/templates/popovers/emoji/emoji_popover.hbs
+++ b/web/templates/popovers/emoji/emoji_popover.hbs
@@ -1,7 +1,7 @@
 <div class="emoji-picker-popover" data-emoji-destination="{{#if message_id }}reaction{{else if is_status_emoji_popover}}status{{else}}composition{{/if}}">
     <div class="emoji-popover">
         <div class="popover-filter-input-wrapper">
-            <input id="emoji-popover-filter" class="popover-filter-input filter_text_input" type="text" placeholder="{{t 'Filter' }}" autofocus/>
+            <input id="emoji-popover-filter" class="popover-filter-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter' }}" autofocus/>
         </div>
         <div class="emoji-popover-category-tabs">
             {{#each emoji_categories}}