diff --git a/public/index.html b/public/index.html
index 26d73b649..04a697324 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3162,6 +3162,7 @@
                                         <option value="gemini-2.5-pro-exp-03-25">Gemini 2.5 Pro Experimental 2025-03-25</option>
                                         <option value="gemini-2.0-pro-exp">Gemini 2.0 Pro Experimental</option>
                                         <option value="gemini-2.0-pro-exp-02-05">Gemini 2.0 Pro Experimental 2025-02-05</option>
+                                        <option value="gemini-2.5-flash-preview-04-17">Gemini 2.5 Flash Preview 2025-04-17</option>
                                         <option value="gemini-2.0-flash-lite-preview">Gemini 2.0 Flash-Lite Preview</option>
                                         <option value="gemini-2.0-flash-lite-preview-02-05">Gemini 2.0 Flash-Lite Preview 2025-02-05</option>
                                         <option value="gemini-2.0-flash-001">Gemini 2.0 Flash [001]</option>
diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html
index a78d33505..2e4b4a3d8 100644
--- a/public/scripts/extensions/caption/settings.html
+++ b/public/scripts/extensions/caption/settings.html
@@ -80,6 +80,7 @@
                         <option data-type="google" value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
                         <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp</option>
                         <option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05</option>
+                        <option data-type="google" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
                         <option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
                         <option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
                         <option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 392b7b682..bba5dcae1 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -4451,7 +4451,7 @@ async function onModelChange() {
             $('#openai_max_context').attr('max', max_32k);
         } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206') || value.includes('gemini-2.0-pro')) {
             $('#openai_max_context').attr('max', max_2mil);
-        } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.5-pro-exp-03-25') || value.includes('gemini-2.5-pro-preview-03-25')) {
+        } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.5-flash-preview-04-17') || value.includes('gemini-2.5-pro-exp-03-25') || value.includes('gemini-2.5-pro-preview-03-25')) {
             $('#openai_max_context').attr('max', max_1mil);
         } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') {
             $('#openai_max_context').attr('max', max_32k);
@@ -5103,6 +5103,7 @@ export function isImageInliningSupported() {
         'gemini-2.5-pro-preview-03-25',
         'gemini-2.0-pro-exp',
         'gemini-2.0-pro-exp-02-05',
+        'gemini-2.5-flash-preview-04-17',
         'gemini-2.0-flash-lite-preview',
         'gemini-2.0-flash-lite-preview-02-05',
         'gemini-2.0-flash',
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index 53c249e26..34a7c6bdd 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -366,6 +366,7 @@ async function sendMakerSuiteRequest(request, response) {
 
         const useSystemPrompt = !useMultiModal && (
             model.includes('gemini-2.5-pro') ||
+            model.includes('gemini-2.5-flash') ||
             model.includes('gemini-2.0-pro') ||
             model.includes('gemini-2.0-flash') ||
             model.includes('gemini-2.0-flash-thinking-exp') ||
diff --git a/src/prompt-converters.js b/src/prompt-converters.js
index a771fc508..8ea3ab896 100644
--- a/src/prompt-converters.js
+++ b/src/prompt-converters.js
@@ -364,6 +364,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt, names) {
         'gemini-2.5-pro-exp-03-25',
         'gemini-2.0-pro-exp',
         'gemini-2.0-pro-exp-02-05',
+        'gemini-2.5-flash-preview-04-17',
         'gemini-2.0-flash-lite-preview',
         'gemini-2.0-flash-lite-preview-02-05',
         'gemini-2.0-flash',