diff --git a/src/graphql/init.js b/src/graphql/init.js
index 3e83534fd1..77a51b2c9c 100644
--- a/src/graphql/init.js
+++ b/src/graphql/init.js
@@ -32,6 +32,9 @@ function init() {
       LocaleFloatType: getLocaleFloatType(this.config.localization),
       blockTypes: {},
     },
+    addBlockType: (blockType, slug) => {
+      this.graphQL.types.blockTypes[slug] = blockType;
+    },
   };
 
   const buildObjectType = getBuildObjectType(this.config, this.graphQL);
diff --git a/src/graphql/schema/getBuildObjectType.js b/src/graphql/schema/getBuildObjectType.js
index 6460fb0d4d..35ccaee8c2 100644
--- a/src/graphql/schema/getBuildObjectType.js
+++ b/src/graphql/schema/getBuildObjectType.js
@@ -176,7 +176,7 @@ function getBuildObjectType(config, graphQL) {
           if (graphQL.types.blockTypes[block.slug] === undefined) {
             const formattedBlockName = formatName(block.labels.singular);
 
-            graphQL.types.blockTypes[block.slug] = buildObjectType(
+            graphQL.addBlockType(buildObjectType(
               formattedBlockName,
               [
                 ...block.fields,
@@ -191,7 +191,7 @@ function getBuildObjectType(config, graphQL) {
                 },
               ],
               formattedBlockName,
-            );
+            ), block.slug);
           }
         });