diff --git a/layouts/AppTopBar.vue b/layouts/AppTopBar.vue
index 7cfb86a29..7b35c9abf 100755
--- a/layouts/AppTopBar.vue
+++ b/layouts/AppTopBar.vue
@@ -4,7 +4,7 @@
             <i class="pi pi-bars"></i>
         </a>
         <div v-tooltip.bottom="$appState.theme" class="app-theme">
-            <img :src="'/demo/images/themes/' + logoMap[$appState.theme]" />
+            <img :src="baseUrl + 'demo/images/themes/' + logoMap[$appState.theme]" />
         </div>
         <ul ref="topbarMenu" class="topbar-menu">
             <li class="topbar-submenu">
@@ -299,7 +299,8 @@ export default {
                 'lara-light-purple': 'lara-light-purple.png',
                 'lara-light-teal': 'lara-light-teal.png',
                 'lara-light-blue': 'lara-light-blue.png'
-            }
+            },
+            baseUrl: '/'
         };
     },
     watch: {
@@ -311,6 +312,7 @@ export default {
     container: null,
     mounted() {
         this.bindScrollListener();
+        this.baseUrl = process.dev ? '/' : '/primevue/nuxt';
     },
     beforeUnmount() {
         if (this.scrollListener) {
diff --git a/service/CountryService.js b/service/CountryService.js
index ed36a94c7..43198320a 100755
--- a/service/CountryService.js
+++ b/service/CountryService.js
@@ -1,6 +1,8 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class CountryService {
     getCountries() {
-        return fetch('demo/data/countries.json')
+        return fetch(baseUrl + 'demo/data/countries.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
diff --git a/service/CustomerService.js b/service/CustomerService.js
index 9ae64485f..482e84aaf 100755
--- a/service/CustomerService.js
+++ b/service/CustomerService.js
@@ -1,24 +1,26 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class CustomerService {
     getCustomersSmall() {
-        return fetch('/demo/data/customers-small.json')
+        return fetch(baseUrl + 'demo/data/customers-small.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
 
     getCustomersMedium() {
-        return fetch('/demo/data/customers-medium.json')
+        return fetch(baseUrl + 'demo/data/customers-medium.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
 
     getCustomersLarge() {
-        return fetch('/demo/data/customers-large.json')
+        return fetch(baseUrl + 'demo/data/customers-large.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
 
     getCustomersXLarge() {
-        return fetch('/demo/data/customers-xlarge.json')
+        return fetch(baseUrl + 'demo/data/customers-xlarge.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
diff --git a/service/EventService.js b/service/EventService.js
index 90fcd9ffd..92b23d1e2 100755
--- a/service/EventService.js
+++ b/service/EventService.js
@@ -1,6 +1,8 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class EventService {
     getEvents() {
-        return fetch('demo/data/events.json')
+        return fetch(baseUrl + 'demo/data/events.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
diff --git a/service/NodeService.js b/service/NodeService.js
index d9a57143e..24f04fe39 100755
--- a/service/NodeService.js
+++ b/service/NodeService.js
@@ -1,12 +1,14 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class NodeService {
     getTreeTableNodes() {
-        return fetch('/demo/data/treetablenodes.json')
+        return fetch(baseUrl + 'demo/data/treetablenodes.json')
             .then((res) => res.json())
             .then((d) => d.root);
     }
 
     getTreeNodes() {
-        return fetch('/demo/data/treenodes.json')
+        return fetch(baseUrl + 'demo/data/treenodes.json')
             .then((res) => res.json())
             .then((d) => d.root);
     }
diff --git a/service/PhotoService.js b/service/PhotoService.js
index 1440df751..126d8f6b1 100755
--- a/service/PhotoService.js
+++ b/service/PhotoService.js
@@ -1,6 +1,8 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class PhotoService {
     getImages() {
-        return fetch('/demo/data/photos.json')
+        return fetch(baseUrl + 'demo/data/photos.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
diff --git a/service/ProductService.js b/service/ProductService.js
index 098a68d28..ce9e026c8 100644
--- a/service/ProductService.js
+++ b/service/ProductService.js
@@ -1,18 +1,20 @@
+const baseUrl = process.env.NODE_ENV === 'production' ? '/primevue-nuxt/' : '/';
+
 export default class ProductService {
     getProductsSmall() {
-        return fetch('/demo/data/products-small.json')
+        return fetch(baseUrl + 'demo/data/products-small.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
 
     getProducts() {
-        return fetch('/demo/data/products-small.json')
+        return fetch(baseUrl + 'demo/data/products-small.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }
 
     getProductsWithOrdersSmall() {
-        return fetch('/demo/data/products-small.json')
+        return fetch(baseUrl + 'demo/data/products-small.json')
             .then((res) => res.json())
             .then((d) => d.data);
     }