diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs
index 60b334bd..28e44a8e 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs
@@ -55,12 +55,12 @@ public partial class ImageCompletionProvider
         var settingsService = _services.GetRequiredService<ILlmProviderService>();
         var state = _services.GetRequiredService<IConversationStateService>();
 
-        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Edit;
-        
         var size = state.GetState("image_size");
         var responseFormat = state.GetState("image_response_format");
         var background = state.GetState("image_background");
 
+        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Edit;
+
         size = settings?.Size != null ? VerifyImageParameter(size, settings.Size.Default, settings.Size.Options) : null;
         responseFormat = settings?.ResponseFormat != null ? VerifyImageParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null;
         background = settings?.Background != null ? VerifyImageParameter(background, settings.Background.Default, settings.Background.Options) : null;
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs
index 9ccecc32..7ac788cf 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs
@@ -32,8 +32,6 @@ public partial class ImageCompletionProvider
 
         var settingsService = _services.GetRequiredService<ILlmProviderService>();
         var state = _services.GetRequiredService<IConversationStateService>();
-
-        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Generation;
         
         var size = state.GetState("image_size");
         var quality = state.GetState("image_quality");
@@ -41,6 +39,8 @@ public partial class ImageCompletionProvider
         var responseFormat = state.GetState("image_response_format");
         var background = state.GetState("image_background");
 
+        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Generation;
+
         size = settings?.Size != null ? VerifyImageParameter(size, settings.Size.Default, settings.Size.Options) : null;
         quality = settings?.Quality != null ? VerifyImageParameter(quality, settings.Quality.Default, settings.Quality.Options) : null;
         style = settings?.Style != null ? VerifyImageParameter(style, settings.Style.Default, settings.Style.Options) : null;
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs
index f51cf583..2f4efb18 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs
@@ -30,11 +30,11 @@ public partial class ImageCompletionProvider
         var settingsService = _services.GetRequiredService<ILlmProviderService>();
         var state = _services.GetRequiredService<IConversationStateService>();
 
-        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Variation;
-
         var size = state.GetState("image_size");
         var responseFormat = state.GetState("image_response_format");
 
+        var settings = settingsService.GetSetting(Provider, _model)?.Image?.Variation;
+
         size = settings?.Size != null ? VerifyImageParameter(size, settings.Size.Default, settings.Size.Options) : null;
         responseFormat = settings?.ResponseFormat != null ? VerifyImageParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null;