diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index 8f17ac62..57e54439 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -218,9 +218,11 @@ namespace Oqtane.Controllers
                 var existingSettings = _settings.GetSettings(entityName, entityId).ToList();
                 foreach (Setting setting in settings)
                 {
+                    // note that setting.SettingId will be 0 if the Settings were converted from a Dictionary in the SettingService
                     Setting existing = existingSettings.FirstOrDefault(item => item.SettingName.Equals(setting.SettingName, StringComparison.OrdinalIgnoreCase));
                     if (existing == null)
                     {
+                        if (setting.SettingId == -1) setting.SettingId = 0;
                         existing = _settings.AddSetting(setting);
                         AddSyncEvent(existing.EntityName, existing.EntityId, existing.SettingId, SyncEventActions.Create);
                         _logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Created {Setting}", existing);
@@ -228,7 +230,6 @@ namespace Oqtane.Controllers
                     }
                     else
                     {
-                        // note that SettingId will pnly be 0 if the Settings were converted from a Dictionary in the SettingService
                         if (existing.SettingValue != setting.SettingValue || (existing.IsPrivate != setting.IsPrivate && setting.SettingId != 0))
                         {
                             existing.SettingValue = setting.SettingValue;