diff --git a/client/src/app/gateways/repositories/base-repository.ts b/client/src/app/gateways/repositories/base-repository.ts
index 8caaaa9bc4..b40d7cf97e 100644
--- a/client/src/app/gateways/repositories/base-repository.ts
+++ b/client/src/app/gateways/repositories/base-repository.ts
@@ -345,6 +345,9 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
                 this.tapViewModels(Object.values(this.viewModelStore));
                 if (changedModels) {
                     await this.initChangeBasedResorting(newModels, updatedModels, newViewModels, updatedViewModels);
+                    for (const viewModel of updatedViewModels) {
+                        viewModel.viewModelUpdateTimestamp = Date.now();
+                    }
                 }
             },
             type: PipelineActionType.General,
diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts
index 2491e5cf78..90e7b6c802 100644
--- a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts
@@ -47,7 +47,8 @@ export class AmendmentControllerService {
                 (prev, curr) =>
                     prev?.length === curr?.length &&
                     Math.max(...prev.map(e => e.viewModelUpdateTimestamp)) ===
-                        Math.max(...curr.map(e => e.viewModelUpdateTimestamp))
+                        Math.max(...curr.map(e => e.viewModelUpdateTimestamp)) &&
+                    prev?.map(e => e.state_id).equals(curr?.map(e => e.state_id))
             )
         );
     }