diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs index 5a00a5390f..ee8580ac22 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs @@ -20,8 +20,12 @@ public class TimeZoneSettingsAppService : SettingManagementAppServiceBase, ITime public virtual async Task GetAsync() { - var timezone = await SettingProvider.GetOrNullAsync(TimingSettingNames.TimeZone); - return timezone ?? "UTC"; + if (CurrentTenant.GetMultiTenancySide() == MultiTenancySides.Host) + { + return await SettingManager.GetOrNullGlobalAsync(TimingSettingNames.TimeZone); + } + + return await SettingManager.GetOrNullForCurrentTenantAsync(TimingSettingNames.TimeZone); } public virtual Task> GetTimezonesAsync()