diff --git a/packages/strapi-admin/admin/src/translations/en.json b/packages/strapi-admin/admin/src/translations/en.json
index 4dc8982e35..c9421f6e27 100644
--- a/packages/strapi-admin/admin/src/translations/en.json
+++ b/packages/strapi-admin/admin/src/translations/en.json
@@ -90,6 +90,7 @@
   "Settings.permissions.conditions.links": "Links",
   "Settings.permissions.conditions.no-actions": "You first need to select actions (create, read, update, ...) before defining conditions on them.",
   "Settings.permissions.conditions.or": "OR",
+  "Settings.permissions.conditions.none-selected": "Anytime",
   "Settings.permissions.conditions.selected.plural": "{number} conditions selected",
   "Settings.permissions.conditions.selected.singular": "{number} condition selected",
   "Settings.permissions.conditions.when": "When",
diff --git a/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ConditionsModal/ConditionsSelect/SingleValue.js b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ConditionsModal/ConditionsSelect/SingleValue.js
index 9706264aaa..fc52c3a250 100644
--- a/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ConditionsModal/ConditionsSelect/SingleValue.js
+++ b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ConditionsModal/ConditionsSelect/SingleValue.js
@@ -15,7 +15,7 @@ const Value = ({ children, selectProps, ...props }) => {
     <SingleValue {...props}>
       <Text style={{ paddingTop: 1 }}>
         {valuesArray.length === 0
-          ? 'Anytime'
+          ? formatMessage({ id: 'Settings.permissions.conditions.none-selected' })
           : formatMessage(
               {
                 id: `Settings.permissions.conditions.selected.${
diff --git a/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ContentTypeCollapse/Collapse/index.js b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ContentTypeCollapse/Collapse/index.js
index ffc343dae5..d1e5f923ab 100644
--- a/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ContentTypeCollapse/Collapse/index.js
+++ b/packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ContentTypeCollapse/Collapse/index.js
@@ -50,6 +50,10 @@ const Collapse = ({ availableActions, isActive, isGrey, label, onClickToggle, pa
     return generateCheckboxesActions(availableActions, modifiedData, pathToData);
   }, [availableActions, modifiedData, pathToData]);
 
+  const doesConditionButtonHasConditions = checkboxesActions.some(
+    ({ hasConditions }) => hasConditions
+  );
+
   return (
     <Wrapper isActive={isActive} isGrey={isGrey}>
       <Flex style={{ flex: 1 }}>
@@ -106,7 +110,11 @@ const Collapse = ({ availableActions, isActive, isGrey, label, onClickToggle, pa
             }
           )}
         </Flex>
-        <ConditionsButton isRight onClick={handleToggleModalIsOpen} />
+        <ConditionsButton
+          isRight
+          onClick={handleToggleModalIsOpen}
+          hasConditions={doesConditionButtonHasConditions}
+        />
       </Flex>
       {modalState.isMounted && (
         <ConditionsModal