diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
index 7c1eed49..84068abb 100644
--- a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
+++ b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
@@ -62,6 +62,7 @@ public class GainfosController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpGet("current")]
+    [IgnoreTenant]
     public async Task<GainfoCurrentResponse> CurrentUserInfoAsync()
     {
         return await _gainfoService.CurrentUserInfoAsync();
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index 0d6e9e3d..8e152fb7 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -212,10 +212,16 @@ public class GainfoService : IGainfoService
 
         if (info != null)
         {
-            var tenantResult = await _tenantApi.GetTenantByCodeAsync(info.Factory);
-            if (tenantResult != null && tenantResult.Data != null)
+            try
+            {
+                var tenantResult = await _tenantApi.GetTenantByCodeAsync(info.Factory);
+                if (tenantResult != null && tenantResult.Data != null)
+                {
+                    info.Factory = tenantResult.Data.Name;
+                }
+            }
+            catch (Exception)
             {
-                info.Factory = tenantResult.Data.Name;
             }
         }