diff --git a/app/views/admin/emails_download/index.html.erb b/app/views/admin/emails_download/index.html.erb
index a8283bbc2..395ff9039 100644
--- a/app/views/admin/emails_download/index.html.erb
+++ b/app/views/admin/emails_download/index.html.erb
@@ -12,6 +12,8 @@
 
     <%= select_tag :users_segment, options_for_select(user_segments_options) %>
 
-    <%= submit_tag t("admin.emails_download.index.download_emails_button"), class: "button" %>
+    <%= submit_tag t("admin.emails_download.index.download_emails_button"),
+      class: "button",
+      data: { disable_with: false } %>
   <% end %>
 </div>
diff --git a/spec/system/admin/emails/emails_download_spec.rb b/spec/system/admin/emails/emails_download_spec.rb
index 9c29a0742..b842e4276 100644
--- a/spec/system/admin/emails/emails_download_spec.rb
+++ b/spec/system/admin/emails/emails_download_spec.rb
@@ -38,4 +38,11 @@ describe "Admin download user emails" do
       expect(file_contents).to match_array ["admin_news1@consul.dev", "admin_news2@consul.dev"]
     end
   end
+
+  scenario "Download button is not disabled after being clicked", :js do
+    visit admin_emails_download_index_path
+    click_button "Download emails list"
+
+    expect(page).to have_button "Download emails list", disabled: false
+  end
 end