diff --git a/packages/gatsby-plugin-create-client-paths/src/gatsby-node.js b/packages/gatsby-plugin-create-client-paths/src/gatsby-node.js
index 11bb7683ca90b..498367be683f9 100644
--- a/packages/gatsby-plugin-create-client-paths/src/gatsby-node.js
+++ b/packages/gatsby-plugin-create-client-paths/src/gatsby-node.js
@@ -15,7 +15,7 @@ exports.onCreatePage = ({ page, store, actions }, { prefixes }) => {
   return new Promise(resolve => {
     // Don't set matchPath again if it's already been set.
     if (page.matchPath || page.path.match(/dev-404-page/)) {
-      resolve()
+      return resolve()
     }
 
     prefixes.some(prefix => {