diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index 4d04838b..66e361fa 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -113,8 +113,11 @@ namespace Oqtane.Services
                 bool ispublic = false;
                 if (value.StartsWith("[Public]"))
                 {
+                    if (entityName == EntityNames.Site)
+                    {
+                        ispublic = true;
+                    }
                     value = value.Substring(8); // remove [Public]
-                    ispublic = true;
                 }
 
                 Setting setting = settingsList.FirstOrDefault(item => item.SettingName.Equals(kvp.Key, StringComparison.OrdinalIgnoreCase));