diff --git a/src/Custom/Responses/Tools/CodeInterpreterToolContainerConfiguration.cs b/src/Custom/Responses/Tools/CodeInterpreterToolContainerConfiguration.cs
index 493ae261c..c17802067 100644
--- a/src/Custom/Responses/Tools/CodeInterpreterToolContainerConfiguration.cs
+++ b/src/Custom/Responses/Tools/CodeInterpreterToolContainerConfiguration.cs
@@ -20,6 +20,6 @@ public static AutomaticCodeInterpreterToolContainerConfiguration CreateAutomatic
         return new AutomaticCodeInterpreterToolContainerConfiguration(
             kind: InternalCodeInterpreterContainerConfigurationType.Auto,
             additionalBinaryDataProperties: null,
-            fileIds: fileIds.ToList());
+            fileIds: fileIds?.ToList());
     }
 }
\ No newline at end of file
diff --git a/tests/Responses/ResponsesToolTests.cs b/tests/Responses/ResponsesToolTests.cs
index 9f9d4797c..4eb338d6d 100644
--- a/tests/Responses/ResponsesToolTests.cs
+++ b/tests/Responses/ResponsesToolTests.cs
@@ -403,7 +403,7 @@ public async Task CodeInterpreterToolWithoutFileIds()
     {
         OpenAIResponseClient client = GetTestClient();
 
-        ResponseTool codeInterpreterTool = ResponseTool.CreateCodeInterpreterTool(new CodeInterpreterToolContainer(new AutomaticCodeInterpreterToolContainerConfiguration()));
+        ResponseTool codeInterpreterTool = ResponseTool.CreateCodeInterpreterTool(new CodeInterpreterToolContainer(CodeInterpreterToolContainerConfiguration.CreateAutomaticContainerConfiguration()));
         ResponseCreationOptions responseOptions = new()
         {
             Tools = { codeInterpreterTool },