diff --git a/tests/cypress/integration/actions_objects/case_99_save_filtered_object_in_AAM.js b/tests/cypress/integration/actions_objects/case_99_save_filtered_object_in_AAM.js
new file mode 100644
index 00000000..eec69265
--- /dev/null
+++ b/tests/cypress/integration/actions_objects/case_99_save_filtered_object_in_AAM.js
@@ -0,0 +1,50 @@
+// Copyright (C) 2021 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+/// <reference types="cypress" />
+
+import { labelName, taskName } from '../../support/const';
+
+context('Save filtered object in AAM.', () => {
+    const caseId = '99';
+    const newLabelName = `New label for case ${caseId}`;
+    const createCuboidShape2Points = {
+        points: 'From rectangle',
+        type: 'Shape',
+        labelName: labelName,
+        firstX: 250,
+        firstY: 350,
+        secondX: 350,
+        secondY: 450,
+    };
+
+    before(() => {
+        cy.openTask(taskName);
+        cy.addNewLabel(newLabelName);
+        cy.openJob();
+        cy.createCuboid(createCuboidShape2Points);
+    });
+
+    describe(`Testing case "${caseId}"`, () => {
+        it(`Set filter label == “${labelName}”.`, () => {
+            cy.addFiltersRule(0);
+            cy.setFilter({
+                groupIndex: 0,
+                ruleIndex: 0,
+                field: 'Label',
+                operator: '==',
+                value: labelName,
+                submit: true,
+            });
+        });
+
+        it(`Go to AAM and change a label for the shape. Save the changes. UI is not failed.`, () => {
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(newLabelName);
+            cy.saveJob();
+            cy.get('#cvat_canvas_shape_1').should('not.exist');
+            cy.get('.attribute-annotations-sidebar-not-found-wrapper').should('exist');
+        });
+    });
+});
diff --git a/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js b/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js
index f6906736..7fcdf071 100644
--- a/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js
+++ b/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js
@@ -50,7 +50,8 @@ context('Mutable attribute.', () => {
 
     describe(`Testing case "${caseId}"`, () => {
         it('Go to AAM. For the 2nd and 3rd frames, change the attribute value.', () => {
-            cy.changeWorkspace('Attribute annotation', labelTrack);
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(labelTrack);
             testChangingAttributeValue(additionalAttrsLabelShape[0].additionalValue, attrValueSecondFrame);
             testChangingAttributeValue(attrValueSecondFrame, attrValueThirdFrame);
         });
diff --git a/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js b/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js
index 2ad22d12..25ef0be7 100644
--- a/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js
+++ b/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js
@@ -37,7 +37,8 @@ context('Attribute annotation mode (AAM) zoom margin feature', () => {
         cy.createTag(labelName);
 
         // go to AAM workspace
-        cy.changeWorkspace('Attribute annotation', labelName);
+        cy.changeWorkspace('Attribute annotation');
+        cy.changeLabelAAM(labelName);
     });
 
     describe(`Testing case "${caseId}"`, () => {
diff --git a/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js b/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js
index f66fb07b..2574d163 100644
--- a/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js
+++ b/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js
@@ -34,7 +34,8 @@ context("Object can't be draggable/resizable in AAM", () => {
         });
 
         it.skip('Go to AAM', () => {
-            cy.changeWorkspace('Attribute annotation', labelName);
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(labelName);
             cy.get('#cvat_canvas_shape_1')
                 .then((shape) => {
                     shapeXPos = Math.floor(shape.attr('x'));
diff --git a/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js b/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js
index 9e8b52d4..4202dd57 100644
--- a/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js
+++ b/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js
@@ -33,7 +33,8 @@ context('Check error сannot read property at saving job', () => {
         });
 
         it('Go to AAM', () => {
-            cy.changeWorkspace('Attribute annotation', labelName);
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(labelName);
         });
 
         it('Save job and go to previous frame at saving job', () => {
diff --git a/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js b/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js
index 0aed69a0..5a5b23fa 100644
--- a/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js
+++ b/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js
@@ -28,7 +28,8 @@ context('The highlighted attribute in AAM should correspond to the chosen attrib
             cy.createRectangle(createRectangleShape2Points);
         });
         it('Go to AAM', () => {
-            cy.changeWorkspace('Attribute annotation', labelName);
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(labelName);
         });
         it('Check if highlighted attribute correspond to the chosen attribute in right panel', () => {
             cy.get('.cvat_canvas_text').within(() => {
diff --git a/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js b/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js
index 98a2ac8b..b867733c 100644
--- a/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js
+++ b/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js
@@ -37,7 +37,8 @@ context('An error occurs in AAM when switching to 2 frames, if the frames have o
             cy.createRectangle(createRectangleShape2PointsSecond);
         });
         it('Go to AAM', () => {
-            cy.changeWorkspace('Attribute annotation', labelName);
+            cy.changeWorkspace('Attribute annotation');
+            cy.changeLabelAAM(labelName);
         });
         it('Go to next frame', () => {
             cy.get('.cvat-player-next-button').click();
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 90176c1e..764a4be5 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -380,14 +380,13 @@ Cypress.Commands.add('saveSettings', () => {
     });
 });
 
-Cypress.Commands.add('changeWorkspace', (mode, labelName) => {
+Cypress.Commands.add('changeWorkspace', (mode) => {
     cy.get('.cvat-workspace-selector').click();
     cy.get('.cvat-workspace-selector-dropdown').within(() => {
         cy.get(`.ant-select-item-option[title="${mode}"]`).click();
     });
 
     cy.get('.cvat-workspace-selector').should('contain.text', mode);
-    cy.changeLabelAAM(labelName);
 });
 
 Cypress.Commands.add('changeLabelAAM', (labelName) => {