diff --git a/client/src/app/domain/models/meetings/meeting.ts b/client/src/app/domain/models/meetings/meeting.ts
index a584b8956c..b3821fec4c 100644
--- a/client/src/app/domain/models/meetings/meeting.ts
+++ b/client/src/app/domain/models/meetings/meeting.ts
@@ -163,9 +163,9 @@ export class Settings {
     public users_email_replyto!: string;
     public users_email_subject!: string;
     public users_email_body!: string;
-    public users_forbid_delegator_in_list_of_speakers!: string;
-    public users_forbid_delegator_as_submitter!: string;
-    public users_forbid_delegator_as_supporter!: string;
+    public users_forbid_delegator_in_list_of_speakers!: boolean;
+    public users_forbid_delegator_as_submitter!: boolean;
+    public users_forbid_delegator_as_supporter!: boolean;
 
     // Assignments
     public assignments_export_title!: string;
diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.html b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.html
index 3f119ba50b..9ae1d79c1f 100644
--- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.html
+++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.html
@@ -102,16 +102,7 @@
             <span *ngIf="!canAddDueToPresence" translate>You have to be present to add yourself.</span>
         </div>
 
-        <div
-            class="add-self-buttons"
-            *osPerms="
-                permission.listOfSpeakersCanBeSpeaker;
-                delegationSettingAlternative: [
-                    'users_forbid_delegator_in_list_of_speakers',
-                    permission.listOfSpeakersCanManage
-                ]
-            "
-        >
+        <div class="add-self-buttons" *ngIf="addSelf && !isOpInWaitlist(true)">
             <!-- Add me and remove me if OP has correct permission -->
 
             <button
diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts
index e27dbd4233..ffc1d8394c 100644
--- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts
+++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts
@@ -76,6 +76,12 @@ export class ListOfSpeakersContentComponent extends BaseMeetingComponent impleme
         return this.pointOfOrderEnabled && this.canAddDueToPresence;
     }
 
+    public get addSelf(): boolean {
+        return (
+            this.permission.listOfSpeakersCanBeSpeaker && !(this.voteDelegationEnabled && this.forbidDelegatorToAddSelf)
+        );
+    }
+
     public get showSpeakerNoteForEveryoneObservable(): Observable<boolean> {
         return this.meetingSettingsService.get(`list_of_speakers_speaker_note_for_everyone`);
     }
@@ -140,6 +146,10 @@ export class ListOfSpeakersContentComponent extends BaseMeetingComponent impleme
 
     public pointOfOrderEnabled = false;
 
+    private voteDelegationEnabled = false;
+
+    private forbidDelegatorToAddSelf = false;
+
     public structureLevelCountdownEnabled = false;
 
     @Output()
@@ -521,6 +531,12 @@ export class ListOfSpeakersContentComponent extends BaseMeetingComponent impleme
             }),
             this.meetingSettingsService.get(`list_of_speakers_default_structure_level_time`).subscribe(time => {
                 this.structureLevelCountdownEnabled = time > 0;
+            }),
+            this.meetingSettingsService.get(`users_enable_vote_delegations`).subscribe(enabled => {
+                this.voteDelegationEnabled = enabled;
+            }),
+            this.meetingSettingsService.get(`users_forbid_delegator_in_list_of_speakers`).subscribe(enabled => {
+                this.forbidDelegatorToAddSelf = enabled;
             })
         );
     }
diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts
index 046f29b343..4b111cecf2 100644
--- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts
@@ -14,6 +14,10 @@ export class MotionPermissionService {
     private _amendmentEnabled = false;
     private _amendmentOfAmendmentEnabled = false;
 
+    private _delegationEnabled = false;
+    private _forbidDelegatorCreateMotions = false;
+    private _forbidDelegatorSupportMotions = false;
+
     public constructor(private operator: OperatorService, private meetingSettingsService: MeetingSettingsService) {
         // load config variables
         this.meetingSettingsService
@@ -25,6 +29,15 @@ export class MotionPermissionService {
         this.meetingSettingsService
             .get(`motions_amendments_of_amendments`)
             .subscribe(enabled => (this._amendmentOfAmendmentEnabled = enabled));
+        this.meetingSettingsService.get(`users_enable_vote_delegations`).subscribe(enabled => {
+            this._delegationEnabled = enabled;
+        });
+        this.meetingSettingsService.get(`users_forbid_delegator_as_submitter`).subscribe(enabled => {
+            this._forbidDelegatorCreateMotions = enabled;
+        });
+        this.meetingSettingsService.get(`users_forbid_delegator_as_supporter`).subscribe(enabled => {
+            this._forbidDelegatorSupportMotions = enabled;
+        });
     }
 
     /**
@@ -63,7 +76,7 @@ export class MotionPermissionService {
         switch (action) {
             case `create`: {
                 return this.operator.hasPerms(
-                    this.operator.isAllowedWithDelegation(`users_forbid_delegator_as_submitter`)
+                    !(this._delegationEnabled && this._forbidDelegatorCreateMotions)
                         ? Permission.motionCanCreate
                         : Permission.motionCanManage
                 );
@@ -74,7 +87,7 @@ export class MotionPermissionService {
                 }
                 return (
                     this.operator.hasPerms(
-                        this.operator.isAllowedWithDelegation(`users_forbid_delegator_as_supporter`)
+                        !(this._delegationEnabled && this._forbidDelegatorSupportMotions)
                             ? Permission.motionCanSupport
                             : Permission.motionCanManage
                     ) &&
@@ -91,7 +104,7 @@ export class MotionPermissionService {
                 }
                 return (
                     this.operator.hasPerms(
-                        this.operator.isAllowedWithDelegation(`users_forbid_delegator_as_supporter`)
+                        !(this._delegationEnabled && this._forbidDelegatorSupportMotions)
                             ? Permission.motionCanSupport
                             : Permission.motionCanManage
                     ) &&
@@ -172,7 +185,7 @@ export class MotionPermissionService {
                 }
                 return (
                     this.operator.hasPerms(
-                        this.operator.isAllowedWithDelegation(`users_forbid_delegator_as_submitter`)
+                        !(this._delegationEnabled && this._forbidDelegatorCreateMotions)
                             ? Permission.motionCanCreateAmendments
                             : Permission.motionCanManage
                     ) &&
diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
index 405f83b4c9..a562c7c07f 100644
--- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
+++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
@@ -911,17 +911,23 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                     {
                         key: `users_forbid_delegator_in_list_of_speakers`,
                         label: _(`Restrict delegation principals from adding themselves to the list of speakers`),
-                        type: `boolean`
+                        type: `boolean`,
+                        indentation: 1,
+                        disable: settings => !settings.users_enable_vote_delegations
                     },
                     {
                         key: `users_forbid_delegator_as_submitter`,
                         label: _(`Restrict delegation principals from creating motions/amendments`),
-                        type: `boolean`
+                        type: `boolean`,
+                        indentation: 1,
+                        disable: settings => !settings.users_enable_vote_delegations
                     },
                     {
                         key: `users_forbid_delegator_as_supporter`,
                         label: _(`Restrict delegation principals from supporting motions`),
-                        type: `boolean`
+                        type: `boolean`,
+                        indentation: 1,
+                        disable: settings => !settings.users_enable_vote_delegations
                     }
                 ]
             },