diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 98b3792..ee465c9 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -316,9 +316,6 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
         {{ if and $ENABLE_AUTH (eq $PROSODY_AUTH_TYPE "hybrid_matrix_token") $MATRIX_LOBBY_BYPASS -}}
         "matrix_lobby_bypass";
         {{ end -}}
-        {{ if not $DISABLE_POLLS -}}
-        "polls";
-        {{ end -}}
         {{ if $ENABLE_SUBDOMAINS -}}
         "muc_domain_mapper";
         {{ end -}}
@@ -448,9 +445,6 @@ Component "breakout.{{ $XMPP_DOMAIN }}" "muc"
     modules_enabled = {
         "muc_hide_all";
         "muc_meeting_id";
-        {{ if not $DISABLE_POLLS -}}
-        "polls";
-        {{ end -}}
         {{ if $ENABLE_RATE_LIMITS -}}
         "muc_rate_limit";
         {{ end -}}
@@ -470,3 +464,7 @@ Component "visitors.{{ $XMPP_DOMAIN }}" "visitors_component"
     auto_allow_visitor_promotion = true
     always_visitors_enabled = true
 {{ end }}
+
+{{ if not $DISABLE_POLLS -}}
+Component "polls.{{ $XMPP_DOMAIN }}" "polls_component"
+{{ end -}}