diff --git a/layouts/AppMenu.vue b/layouts/AppMenu.vue
index 1cba93149..bb7d50116 100755
--- a/layouts/AppMenu.vue
+++ b/layouts/AppMenu.vue
@@ -80,7 +80,7 @@ export default {
             filteredRoutes: null,
             selectedRoute: null,
             routes: [],
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     mounted() {
@@ -97,8 +97,6 @@ export default {
 
             this.routes.push(childRoute);
         });
-
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         toggleSubmenu(event, name) {
diff --git a/layouts/AppTopBar.vue b/layouts/AppTopBar.vue
index 0bc82b977..0403b55b0 100755
--- a/layouts/AppTopBar.vue
+++ b/layouts/AppTopBar.vue
@@ -300,7 +300,7 @@ export default {
                 'lara-light-teal': 'lara-light-teal.png',
                 'lara-light-blue': 'lara-light-blue.png'
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     watch: {
@@ -312,7 +312,6 @@ export default {
     container: null,
     mounted() {
         this.bindScrollListener();
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     beforeUnmount() {
         if (this.scrollListener) {