diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index 74cf3949..2e90d66b 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -134,13 +134,20 @@ namespace Oqtane.Services
                 bool ispublic = false;
                 if (value.StartsWith("[Public]"))
                 {
-                    if (entityName == EntityNames.Site)
+                    switch (entityName)
                     {
-                        ispublic = true;
+                        case EntityNames.Site:
+                        case EntityNames.ModuleDefinition:
+                            ispublic = true;
+                            break;
+                        default:
+                            ispublic = false;
+                            break;
                     }
-                    value = value.Substring(8); // remove [Public]
+                    value = value.Substring(8); // remove [Public]                   
                 }
 
+
                 Setting setting = settingsList.FirstOrDefault(item => item.SettingName.Equals(kvp.Key, StringComparison.OrdinalIgnoreCase));
                 if (setting == null)
                 {