diff --git a/async-openai/src/file.rs b/async-openai/src/file.rs
index b202a49a..3f33ab2a 100644
--- a/async-openai/src/file.rs
+++ b/async-openai/src/file.rs
@@ -145,4 +145,13 @@ mod tests {
         assert_eq!(openai_file.id, delete_response.id);
         assert!(delete_response.deleted);
     }
+
+    // Ensures that list files succeeds if there are no files in account
+    // Prerequisite: No files in account
+    #[tokio::test]
+    async fn test_empty_file_list() {
+        let client = Client::new();
+        let result = client.files().list().await.unwrap();
+        assert!(result.data.is_empty());
+    }
 }
diff --git a/async-openai/src/types/files/file.rs b/async-openai/src/types/files/file.rs
index c93e1cda..51b98145 100644
--- a/async-openai/src/types/files/file.rs
+++ b/async-openai/src/types/files/file.rs
@@ -60,8 +60,8 @@ pub struct CreateFileRequest {
 pub struct ListFilesResponse {
     pub object: String,
     pub data: Vec<OpenAIFile>,
-    pub first_id: String,
-    pub last_id: String,
+    pub first_id: Option<String>,
+    pub last_id: Option<String>,
     pub has_more: bool,
 }