diff --git a/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/AWSSDK.Extensions.Bedrock.MEAI.nuspec b/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/AWSSDK.Extensions.Bedrock.MEAI.nuspec
index 66f6c9157c99..556bec0a8dd0 100644
--- a/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/AWSSDK.Extensions.Bedrock.MEAI.nuspec
+++ b/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/AWSSDK.Extensions.Bedrock.MEAI.nuspec
@@ -3,7 +3,7 @@
   <metadata> 
     <id>AWSSDK.Extensions.Bedrock.MEAI</id>
     <title>AWSSDK - Bedrock integration with Microsoft.Extensions.AI.</title>
-    <version>4.0.1.0</version>
+    <version>4.0.1.1</version>
     <authors>Amazon Web Services</authors>
     <description>Implementations of Microsoft.Extensions.AI's abstractions for Bedrock.</description>
     <language>en-US</language>
diff --git a/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/BedrockChatClient.cs b/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/BedrockChatClient.cs
index 86dfdac81149..a47b708ea9db 100644
--- a/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/BedrockChatClient.cs
+++ b/extensions/src/AWSSDK.Extensions.Bedrock.MEAI/BedrockChatClient.cs
@@ -592,7 +592,7 @@ private static string GetMimeType(VideoFormat? format) =>
     /// <summary>Converts a <see cref="Dictionary{String, Object}"/> to a <see cref="Document"/>.</summary>
     private static Document DictionaryToDocument(IDictionary<string, object?>? arguments)
     {
-        Document inputs = default;
+        Document inputs = new Document(new Dictionary<string, Document>());
         if (arguments is not null)
         {
             foreach (KeyValuePair<string, object?> argument in arguments)
@@ -704,6 +704,21 @@ private static Document ToDocument(JsonElement json)
                 }
             }
 
+            var schemaDictionary = new Dictionary<string, Document>()
+            {
+                ["type"] = new Document("object"),
+            };
+
+            if (inputs != default)
+            {
+                schemaDictionary["properties"] = inputs;
+            }
+
+            if (required.Count > 0)
+            {
+                schemaDictionary["required"] = new Document(required);
+            }
+
             return new Tool()
             {
                 ToolSpec = new ToolSpecification()
@@ -712,12 +727,7 @@ private static Document ToDocument(JsonElement json)
                     Description = !string.IsNullOrEmpty(f.Description) ? f.Description : f.Name,
                     InputSchema = new()
                     {
-                        Json = new(new Dictionary<string, Document>()
-                        {
-                            ["type"] = new Document("object"),
-                            ["properties"] = inputs,
-                            ["required"] = new Document(required),
-                        })
+                        Json = new(schemaDictionary)
                     },
                 },
             };