diff --git a/testsuite/features/secondary/min_recurring_action.feature b/testsuite/features/secondary/min_recurring_action.feature
index 2dbaf5c4f9cc..d104bb05798a 100644
--- a/testsuite/features/secondary/min_recurring_action.feature
+++ b/testsuite/features/secondary/min_recurring_action.feature
@@ -34,7 +34,6 @@ Feature: Recurring Actions
     And I click on "Save Changes"
     And I wait until I see "Edit State Ranks" text
     And I click on "Confirm"
-    And I wait until I see "State assignments have been saved." text
     And I click on "Create Schedule"
     Then I wait until I see "Schedule successfully created" text
     And I should see a "IP forwarding custom state recurring action" text
@@ -56,7 +55,6 @@ Feature: Recurring Actions
     And I click on "Save Changes"
     And I wait until I see "Edit State Ranks" text
     And I click on "Confirm"
-    And I wait until I see "State assignments have been saved" text
     And I click on "Update Schedule"
     Then I wait until I see "Schedule successfully updated" text
     And I should see a "custom_state_schedule_name_changed" text
diff --git a/web/html/src/components/states-picker.tsx b/web/html/src/components/states-picker.tsx
index 5c9bf042c782..7ef00ee0216d 100644
--- a/web/html/src/components/states-picker.tsx
+++ b/web/html/src/components/states-picker.tsx
@@ -149,7 +149,10 @@ class StatesPicker extends React.Component<StatesPickerProps, StatesPickerState>
           }
         });
 
-        messages = messages.concat(MessagesUtils.info(t("State assignments have been saved.")));
+        messages =
+          this.props.type === "state"
+            ? messages
+            : messages.concat(MessagesUtils.info(t("State assignments have been saved.")));
         this.setState({
           changed: new Map(), // clear changed
           // Update the channels with the new data