diff --git a/apps/dashboard/src/main/java/com/akto/action/testing/TestRolesAction.java b/apps/dashboard/src/main/java/com/akto/action/testing/TestRolesAction.java
index c7e44d06bd..94536e48bb 100644
--- a/apps/dashboard/src/main/java/com/akto/action/testing/TestRolesAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/testing/TestRolesAction.java
@@ -180,8 +180,8 @@ public String updateTestRoles() {
             isAttackerRole = role.getId().equals(attackerRole.getId());
         }
         if (isAttackerRole) {
-            addActionError("Unable to update endpoint conditions for attacker role");
-            return ERROR.toUpperCase();
+            this.orConditions = null;
+            this.andConditions = null;
         }
 
         Conditions orConditions = null;
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx
index f38242d09a..115d0780e7 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx
@@ -131,7 +131,7 @@ function TestRoleSettings() {
     const saveAction = async (updatedAuth=false, authWithCondLists = null) => {
         let andConditions = transform.filterContainsConditions(conditions, 'AND')
         let orConditions = transform.filterContainsConditions(conditions, 'OR')
-        if (!(andConditions || orConditions) || roleName.length === 0) {
+        if (roleName !== 'ATTACKER_TOKEN_ALL' && !(andConditions || orConditions) || roleName.length === 0) {
             func.setToast(true, true, "Please select valid values for a test role")
         } else {
             if (isNew) {
@@ -235,7 +235,7 @@ function TestRoleSettings() {
         }
     }
 
-    const conditionsCard = (
+    const conditionsCard = roleName !== 'ATTACKER_TOKEN_ALL' ? (
         <LegacyCard title="Details" key="condition">
             <TestRolesConditionsPicker
                 title="Role endpoint conditions"
@@ -245,7 +245,7 @@ function TestRoleSettings() {
                 selectOptions={selectOptions}
             />
         </LegacyCard>
-    )
+    ) : (<></>)
 
     const deleteModalComp = (
         <Modal