diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html
index a25ba24484..21d6a7b69a 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html
@@ -1,6 +1,8 @@
 <h4>
-    <span class="title-font">{{ title }}</span>
-    @if (perms.isAllowed('change_metadata')) {
+    @if (!isEmpty || canChangeMetadata) {
+        <span class="title-font">{{ title }}</span>
+    }
+    @if (canChangeMetadata) {
         @if (isEditMode) {
             <button class="small-button" disableRipple mat-icon-button type="button" (click)="onCancel()">
                 <mat-icon>close</mat-icon>
@@ -13,7 +15,7 @@ <h4>
     }
 </h4>
 
-@if (!isEditMode || !perms.isAllowed('change_metadata')) {
+@if (!isEditMode || !canChangeMetadata) {
     <div>
         <div>{{ motion[field] | localizedDate }}</div>
     </div>
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts
index bbc7c9d0a9..4c4a98e36c 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts
@@ -1,11 +1,12 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { fromUnixTime, getHours, getMinutes, isDate } from 'date-fns';
+import { Permission } from 'src/app/domain/definitions/permission';
 import { KeyOfType } from 'src/app/infrastructure/utils/keyof-type';
+import { OperatorService } from 'src/app/site/services/operator.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
 import { MotionControllerService } from '../../../../../../services/common/motion-controller.service';
-import { MotionPermissionService } from '../../../../../../services/common/motion-permission.service';
 import { ViewMotion } from '../../../../../../view-models';
 
 @Component({
@@ -14,7 +15,7 @@ import { ViewMotion } from '../../../../../../view-models';
     styleUrls: [`./motion-manage-timestamp.component.scss`],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MotionManageTimestampComponent extends BaseUiComponent {
+export class MotionManageTimestampComponent extends BaseUiComponent implements OnInit {
     public get motion(): ViewMotion {
         return this._motion;
     }
@@ -43,14 +44,24 @@ export class MotionManageTimestampComponent extends BaseUiComponent {
         return this._editMode;
     }
 
+    public get isEmpty(): boolean {
+        return !this.motion[this.field];
+    }
+
+    public get canChangeMetadata(): boolean {
+        return this._change_metadata;
+    }
+
     private _editMode = false;
+    private _change_metadata = false;
 
     private _motion!: ViewMotion;
 
     public constructor(
-        public perms: MotionPermissionService,
         private motionController: MotionControllerService,
-        private fb: UntypedFormBuilder
+        private fb: UntypedFormBuilder,
+        private operator: OperatorService,
+        private cd: ChangeDetectorRef
     ) {
         super();
 
@@ -73,6 +84,15 @@ export class MotionManageTimestampComponent extends BaseUiComponent {
         );
     }
 
+    public ngOnInit(): void {
+        this.subscriptions.push(
+            this.operator.permissionsObservable.subscribe(() => {
+                this._change_metadata = this.operator.hasPerms(Permission.motionCanManageMetadata);
+                this.cd.markForCheck();
+            })
+        );
+    }
+
     public async onSave(): Promise<void> {
         const date: { date: Date | null; time: string } = this.form.value;
         const [hours, minutes, ..._] = date.time.split(`:`);