diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 8616f65a30..e5acd5a2e7 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -325,8 +325,9 @@ fedora_epel_test_announce_list = epel-devel@lists.fedoraproject.org
 #
 # Public lists where we send module update announcments.
 #
-fedora_modular_announce_list = package-announce@lists.fedoraproject.org
-fedora_modular_test_announce_list = test@lists.fedoraproject.org
+# These are commented due to https://github.com/fedora-infra/bodhi/issues/2396
+# fedora_modular_announce_list = package-announce@lists.fedoraproject.org
+# fedora_modular_test_announce_list = test@lists.fedoraproject.org
 
 # Superuser groups
 # admin_groups = proventesters security_respons bodhiadmin sysadmin-main