diff --git a/src/main/java/com/crowdin/client/sourcefiles/model/FileInfo.java b/src/main/java/com/crowdin/client/sourcefiles/model/FileInfo.java
index a06efa86..5374a1c8 100644
--- a/src/main/java/com/crowdin/client/sourcefiles/model/FileInfo.java
+++ b/src/main/java/com/crowdin/client/sourcefiles/model/FileInfo.java
@@ -1,5 +1,7 @@
 package com.crowdin.client.sourcefiles.model;
 
+import com.crowdin.client.core.http.impl.json.EmptyArrayToNullDeserializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 import java.util.Map;
@@ -20,5 +22,6 @@ public class FileInfo {
     /**
      * Custom fields (Enterprise only)
      */
+    @JsonDeserialize(using = EmptyArrayToNullDeserializer.class)
     private Map<String, Object> fields;
 }
diff --git a/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java b/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java
index 60fd09fa..0f02e577 100644
--- a/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java
+++ b/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java
@@ -510,6 +510,7 @@ public void listFileInfosTest() {
         ResponseList<? extends FileInfo> response = this.getSourceFilesApi().listFiles(project2Id, null, null, null, null, null, null);
         assertEquals(response.getData().size(), 1);
         assertTrue(response.getData().get(0).getData() instanceof FileInfo);
+        assertNull(response.getData().get(0).getData().getFields());
     }
 
     @Test
diff --git a/src/test/resources/api/sourcefiles/listFileInfos.json b/src/test/resources/api/sourcefiles/listFileInfos.json
index eae43446..a4d6d5c7 100644
--- a/src/test/resources/api/sourcefiles/listFileInfos.json
+++ b/src/test/resources/api/sourcefiles/listFileInfos.json
@@ -12,7 +12,8 @@
         "type": "xliff",
         "parserVersion": 1,
         "path": "/directory1/directory2/filename.extension",
-        "status": "active"
+        "status": "active",
+        "fields": []
       }
     }
   ],