diff --git a/servers/fastapi/utils/image_provider.py b/servers/fastapi/utils/image_provider.py
index 8a2f01ff..84e0677f 100644
--- a/servers/fastapi/utils/image_provider.py
+++ b/servers/fastapi/utils/image_provider.py
@@ -24,13 +24,16 @@ def is_dalle3_selected() -> bool:
     return ImageProvider.DALLE3 == get_selected_image_provider()
 
 
-def get_selected_image_provider() -> ImageProvider:
+def get_selected_image_provider() -> ImageProvider | None:
     """
     Get the selected image provider from environment variables.
     Returns:
         ImageProvider: The selected image provider.
     """
-    return ImageProvider(get_image_provider_env())
+    image_provider_env = get_image_provider_env()
+    if image_provider_env:
+        return ImageProvider(image_provider_env)
+    return None
 
 
 def get_image_provider_api_key() -> str: