diff --git a/sentry_sdk/integrations/mcp.py b/sentry_sdk/integrations/mcp.py
index 1d2b43e874..75f806d683 100644
--- a/sentry_sdk/integrations/mcp.py
+++ b/sentry_sdk/integrations/mcp.py
@@ -286,7 +286,7 @@ async def _tool_handler_wrapper(
         handler_name = original_kwargs["name"]
 
     arguments = {}
-    if len(original_args) > 1:
+    if len(original_args) > 1 and original_args[1] is not None:
         arguments = original_args[1]
     elif original_kwargs.get("arguments"):
         arguments = original_kwargs["arguments"]
@@ -514,7 +514,7 @@ async def _prompt_handler_wrapper(
         handler_name = original_kwargs["name"]
 
     arguments = {}
-    if len(original_args) > 1:
+    if len(original_args) > 1 and original_args[1] is not None:
         arguments = original_args[1]
     elif original_kwargs.get("arguments"):
         arguments = original_kwargs["arguments"]