diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
index ffa79660f3..946b09a6f2 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
@@ -75,7 +75,7 @@ export class TopicPollService extends PollService {
         const poll: Partial<Poll> = {
             title: this.translate.instant(`Vote`),
             onehundred_percent_base: this.defaultPercentBase,
-            entitled_group_ids: Object.values(this.defaultGroupIds),
+            entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
             pollmethod: this.defaultPollMethod,
             type: this.defaultPollType,
             backend: PollBackendDurationType.FAST
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
index 7663a82bec..eb18facaab 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
@@ -76,7 +76,7 @@ export class AssignmentPollService extends PollService {
         const poll: Partial<Poll> = {
             title: this.translate.instant(`Ballot`),
             onehundred_percent_base: this.defaultPercentBase,
-            entitled_group_ids: Object.values(this.defaultGroupIds),
+            entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
             pollmethod: this.defaultPollMethod,
             type: this.isElectronicVotingEnabled ? this.defaultPollType : PollType.Analog
         };
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
index a58880ceb8..1562fc0650 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
@@ -65,7 +65,7 @@ export class MotionPollService extends PollService {
         const poll: Partial<Poll> = {
             title: this.translate.instant(`Vote`),
             onehundred_percent_base: this.defaultPercentBase,
-            entitled_group_ids: Object.values(this.defaultGroupIds),
+            entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
             type: this.isElectronicVotingEnabled ? this.defaultPollType : PollType.Analog,
             pollmethod: PollMethod.YNA
         };
diff --git a/client/src/assets/styles/theme-styles.scss b/client/src/assets/styles/theme-styles.scss
index 873ebfc0b2..0e8681a939 100644
--- a/client/src/assets/styles/theme-styles.scss
+++ b/client/src/assets/styles/theme-styles.scss
@@ -8,10 +8,11 @@
 /** Global component style definition */
 @import 'global-components-style.scss';
 
+@include mat.all-component-themes($openslides-light-theme);
+
 .openslides-light-theme {
     /*TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated */
     @include mat.all-legacy-component-themes($openslides-light-theme);
-    @include mat.all-component-themes($openslides-light-theme);
     @include os-component-themes($openslides-light-theme);
 }