diff --git a/lib/gtfs/util/index.js b/lib/gtfs/util/index.js
index 0e1d84602..136520c08 100644
--- a/lib/gtfs/util/index.js
+++ b/lib/gtfs/util/index.js
@@ -44,8 +44,10 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
   if (table) {
     fields = table.fields
       // Only filter required fields if not fetching for editor
-      // FIXME: Check that ALL missing datatools fields are in GraphQL schema
-      .filter(field => editor ? field : field.required && !field.datatools)
+      // FIXME: This fetches only the required fields for feed info because there
+      // are missing fields in the GraphQL schema and database (default color and
+      // default route type).
+      .filter(field => type === 'feedinfo' ? !field.datatools : editor ? field : field.required && !field.datatools)
       .map(field => field.name)
       .join('\n')
     // stop_times are a special case because they must be requested as a