diff --git a/astrbot/core/platform/sources/webchat/webchat_event.py b/astrbot/core/platform/sources/webchat/webchat_event.py
index ef553292..30a6322a 100644
--- a/astrbot/core/platform/sources/webchat/webchat_event.py
+++ b/astrbot/core/platform/sources/webchat/webchat_event.py
@@ -21,7 +21,7 @@ class WebChatMessageEvent(AstrMessageEvent):
             await web_chat_back_queue.put(
                 {"type": "end", "data": "", "streaming": False}
             )
-            return
+            return ""
 
         cid = session_id.split("!")[-1]
         data = ""
diff --git a/astrbot/core/provider/func_tool_manager.py b/astrbot/core/provider/func_tool_manager.py
index 72180759..325f8919 100644
--- a/astrbot/core/provider/func_tool_manager.py
+++ b/astrbot/core/provider/func_tool_manager.py
@@ -339,7 +339,7 @@ class FuncCall:
             ]
             logger.info(f"已关闭 MCP 服务 {name}")
 
-    def get_func_desc_openai_style(self, omit_empty_parameter_field = True) -> list:
+    def get_func_desc_openai_style(self, omit_empty_parameter_field = False) -> list:
         """
         获得 OpenAI API 风格的**已经激活**的工具描述
         """
diff --git a/astrbot/core/provider/sources/openai_source.py b/astrbot/core/provider/sources/openai_source.py
index 703572b8..110d0d43 100644
--- a/astrbot/core/provider/sources/openai_source.py
+++ b/astrbot/core/provider/sources/openai_source.py
@@ -87,7 +87,8 @@ class ProviderOpenAIOfficial(Provider):
 
     async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
         if tools:
-            omit_empty_param_field = "grok" not in payloads.get("model", "").lower()
+            model = payloads.get("model", "").lower()
+            omit_empty_param_field = "gemini" in model
             tool_list = tools.get_func_desc_openai_style(
                 omit_empty_parameter_field=omit_empty_param_field
             )
@@ -124,7 +125,8 @@ class ProviderOpenAIOfficial(Provider):
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式查询API，逐步返回结果"""
         if tools:
-            omit_empty_param_field = "grok" not in payloads.get("model", "").lower()
+            model = payloads.get("model", "").lower()
+            omit_empty_param_field = "gemini" in model
             tool_list = tools.get_func_desc_openai_style(
                 omit_empty_parameter_field=omit_empty_param_field
             )