diff --git a/lib/app/server.js b/lib/app/server.js index fa5cff0c75..f4b2ec16d4 100644 --- a/lib/app/server.js +++ b/lib/app/server.js @@ -81,7 +81,7 @@ export default context => { // nuxtServerInit <% if (store) { %> let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', omit(getContext(context), 'redirect', 'error')) : null) - if (!(promise instanceof Promise)) promise = Promise.resolve() + if (!promise || (!(promise instanceof Promise) && (promise && typeof promise.then !== 'function'))) promise = Promise.resolve() <% } else { %> let promise = Promise.resolve() <% } %>