diff --git a/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java b/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
index 9dfe14e29..1d8531654 100644
--- a/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
+++ b/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
@@ -94,7 +94,7 @@ public interface ConfigService {
    */
   default DynamicConfig getTenantUserConfigFromCache(String tenantId, String userId) {
     TenantConfig tenantConfig = getRawTenantUserConfigFromCache(tenantId, userId);
-    if (tenantConfig == null) {
+    if (tenantConfig == null || tenantConfig.getConfigs().isEmpty()) {
       return getTenantConfigFromCache(tenantId);
     } else {
       return tenantConfig;