diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
index 4092c4ff0..9e35c8d19 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
@@ -38,6 +38,7 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
         }
 
         String tenantId = TENANT_ID.get();
+        TENANT_ID.remove();
         if (tenantId == null) {
             tenantId = TenantHelper.getTenantId();
         }