diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 68c9d963bc..e7b33e796c 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -765,7 +765,7 @@ public class BrokerController {
         }
 
         if (this.brokerConfig.isEnableControllerMode()) {
-            this.replicasManager.setIsolatedAndBrokerPermission(false);
+            this.replicasManager.setFenced(true);
         }
 
         if (messageStore != null) {
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
index 005d6b3cb0..abae7cdb01 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
@@ -93,8 +93,6 @@ public class ReplicasManager {
 
     private Long masterBrokerId;
 
-    private volatile int originalBrokerPermission = 0;
-
     private BrokerMetadata brokerMetadata;
 
     private TempBrokerMetadata tempBrokerMetadata;
@@ -203,7 +201,7 @@ public class ReplicasManager {
             if (this.masterBrokerId != null || brokerElect()) {
                 LOGGER.info("Master in this broker set is elected, masterBrokerId: {}, masterBrokerAddr: {}", this.masterBrokerId, this.masterAddress);
                 this.state = State.RUNNING;
-                setIsolatedAndBrokerPermission(true);
+                setFenced(false);
                 LOGGER.info("All register process has been done, change state to: {}", this.state);
             } else {
                 return false;
@@ -241,7 +239,6 @@ public class ReplicasManager {
         synchronized (this) {
             if (newMasterEpoch > this.masterEpoch) {
                 LOGGER.info("Begin to change to master, brokerName:{}, replicas:{}, new Epoch:{}", this.brokerConfig.getBrokerName(), this.brokerAddress, newMasterEpoch);
-
                 this.masterEpoch = newMasterEpoch;
                 if (this.masterBrokerId != null && this.masterBrokerId.equals(this.brokerControllerId) && this.brokerController.getBrokerConfig().getBrokerId() == MixAll.MASTER_ID) {
                     // Change SyncStateSet
@@ -873,17 +870,8 @@ public class ReplicasManager {
         return tempBrokerMetadata;
     }
 
-    public void setIsolatedAndBrokerPermission(boolean isBrokerRoleConfirmed) {
-        if (isBrokerRoleConfirmed) {
-            this.brokerController.setIsolated(false);
-            this.brokerConfig.setBrokerPermission(this.originalBrokerPermission);
-            this.brokerController.getMessageStore().getRunningFlags().makeIsolated(false);
-        } else {
-            // prohibit writing and reading before confirming the broker role
-            this.brokerController.setIsolated(true);
-            this.originalBrokerPermission = this.brokerConfig.getBrokerPermission();
-            this.brokerConfig.setBrokerPermission(0);
-            this.brokerController.getMessageStore().getRunningFlags().makeIsolated(true);
-        }
+    public void setFenced(boolean fenced) {
+        this.brokerController.setIsolated(fenced);
+        this.brokerController.getMessageStore().getRunningFlags().makeFenced(fenced);
     }
 }
diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index 1c8cb7ab60..2140168c45 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -555,7 +555,7 @@ public class CommitLog implements Swappable {
 
     public long getConfirmOffset() {
         if (this.defaultMessageStore.getBrokerConfig().isEnableControllerMode()) {
-            if (this.defaultMessageStore.getMessageStoreConfig().getBrokerRole() != BrokerRole.SLAVE && !this.defaultMessageStore.getRunningFlags().isIsolated()) {
+            if (this.defaultMessageStore.getMessageStoreConfig().getBrokerRole() != BrokerRole.SLAVE && !this.defaultMessageStore.getRunningFlags().isFenced()) {
                 if (((AutoSwitchHAService) this.defaultMessageStore.getHaService()).getLocalSyncStateSet().size() == 1) {
                     return this.defaultMessageStore.getMaxPhyOffset();
                 }
diff --git a/store/src/main/java/org/apache/rocketmq/store/RunningFlags.java b/store/src/main/java/org/apache/rocketmq/store/RunningFlags.java
index 6a0ef5a5f3..2ae6879aad 100644
--- a/store/src/main/java/org/apache/rocketmq/store/RunningFlags.java
+++ b/store/src/main/java/org/apache/rocketmq/store/RunningFlags.java
@@ -28,7 +28,7 @@ public class RunningFlags {
 
     private static final int DISK_FULL_BIT = 1 << 4;
 
-    private static final int ISOLATED_BIT = 1 << 5;
+    private static final int FENCED_BIT = 1 << 5;
 
     private volatile int flagBits = 0;
 
@@ -51,8 +51,8 @@ public class RunningFlags {
         return (this.flagBits & NOT_READABLE_BIT) == 0;
     }
 
-    public boolean isIsolated() {
-        return (this.flagBits & ISOLATED_BIT) != 0;
+    public boolean isFenced() {
+        return (this.flagBits & FENCED_BIT) != 0;
     }
 
     public boolean getAndMakeNotReadable() {
@@ -72,7 +72,7 @@ public class RunningFlags {
     }
 
     public boolean isWriteable() {
-        if ((this.flagBits & (NOT_WRITEABLE_BIT | WRITE_LOGICS_QUEUE_ERROR_BIT | DISK_FULL_BIT | WRITE_INDEX_FILE_ERROR_BIT)) == 0) {
+        if ((this.flagBits & (NOT_WRITEABLE_BIT | WRITE_LOGICS_QUEUE_ERROR_BIT | DISK_FULL_BIT | WRITE_INDEX_FILE_ERROR_BIT | FENCED_BIT)) == 0) {
             return true;
         }
 
@@ -100,11 +100,11 @@ public class RunningFlags {
         this.flagBits |= WRITE_LOGICS_QUEUE_ERROR_BIT;
     }
 
-    public void makeIsolated(boolean isolated) {
-        if (isolated) {
-            this.flagBits |= ISOLATED_BIT;
+    public void makeFenced(boolean fenced) {
+        if (fenced) {
+            this.flagBits |= FENCED_BIT;
         } else {
-            this.flagBits &= ~ISOLATED_BIT;
+            this.flagBits &= ~FENCED_BIT;
         }
     }
 
diff --git a/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java b/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java
index 19b4c8eb7f..27dcff1416 100644
--- a/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java
@@ -232,11 +232,11 @@ public class AutoSwitchHATest {
 
         storeConfig2.setBrokerRole(BrokerRole.SYNC_MASTER);
         messageStore2 = buildMessageStore(storeConfig2, 2L);
-        messageStore2.getRunningFlags().makeIsolated(true);
+        messageStore2.getRunningFlags().makeFenced(true);
         assertTrue(messageStore2.load());
         messageStore2.start();
         messageStore2.getHaService().changeToMaster(2);
-        messageStore2.getRunningFlags().makeIsolated(false);
+        messageStore2.getRunningFlags().makeFenced(false);
         ((AutoSwitchHAService) messageStore2.getHaService()).setSyncStateSet(new HashSet<>(Collections.singletonList(2L)));
 
         // Put message on master
@@ -493,10 +493,10 @@ public class AutoSwitchHATest {
         storeCheckpoint.setConfirmPhyOffset(setConfirmOffset);
         storeCheckpoint.shutdown();
         messageStore2 = buildMessageStore(storeConfig2, 2L);
-        messageStore2.getRunningFlags().makeIsolated(true);
+        messageStore2.getRunningFlags().makeFenced(true);
         assertTrue(messageStore2.load());
         messageStore2.start();
-        messageStore2.getRunningFlags().makeIsolated(false);
+        messageStore2.getRunningFlags().makeFenced(false);
         assertEquals(setConfirmOffset, messageStore2.getConfirmOffset());
         checkMessage(this.messageStore2, 5, 0);
     }