diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index 0b25634a..16a33811 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -38,7 +38,15 @@ namespace Oqtane.Repository
 
         public IEnumerable<Setting> GetSettings(string entityName, int entityId)
         {
-            return GetSettings(entityName).Where(item => item.EntityId == entityId);
+            if (IsMaster(entityName))
+            {
+                return _master.Setting.Where(item => item.EntityName == entityName && item.EntityId == entityId).ToList();
+            }
+            else
+            {
+                using var db = _tenantContextFactory.CreateDbContext();
+                return db.Setting.Where(item => item.EntityName == entityName && item.EntityId == entityId).ToList();
+            }
         }
 
         public IEnumerable<Setting> GetSettings(string entityName1, int entityId1, string entityName2, int entityId2)