diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
index 4ac229583..1b69c6fb6 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
@@ -75,10 +75,16 @@ public class TenantContextHolderFilter extends GenericFilterBean {
             TenantContextHolder.setTenantId(CommonConstants.TENANT_ID_1);
         }
 
-        if (!checkTenantStatus(request, response)) return;
+        if (!checkTenantStatus(request, response)) {
+            TenantContextHolder.clear();
+            return;
+        }
 
-        filterChain.doFilter(request, response);
-        TenantContextHolder.clear();
+        try {
+            filterChain.doFilter(request, response);
+        } finally {
+            TenantContextHolder.clear();
+        }
     }
 
     /**