diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js index e8fb3eba4ef7..43d5795018d9 100644 --- a/packages/vue-app/template/client.js +++ b/packages/vue-app/template/client.js @@ -598,7 +598,11 @@ function normalizeComponents (to, ___) { <% if (features.layouts) { %> function setLayoutForNextPage (to) { // Set layout - let layout = this.$options.nuxt.err + let hasError = Boolean(this.$options.nuxt.err) + if (this._hadError && this._dateLastError === this.$options.nuxt.dateErr) { + hasError = false + } + let layout = hasError ? (NuxtError.options || NuxtError).layout : to.matched[0].components.default.options.layout