diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 000000000..82ca1ead4
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,8 @@
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /primevue/
+RewriteRule ^primevue/index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /primevue/index.php [L]
+</IfModule>
diff --git a/public/index.html b/public/index.html
index d83f6f40a..257f9a267 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        <base href="<%= BASE_URL %>">
         <script async src="https://www.googletagmanager.com/gtag/js?id=UA-93461466-1"></script>
         <script>
             window.dataLayer = window.dataLayer || [];
diff --git a/src/router/index.js b/src/router/index.js
index d16c5cc99..695dd2811 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,4 @@
-import {createRouter, createWebHashHistory} from 'vue-router'
+import {createRouter, createWebHistory} from 'vue-router';
 import Home from '../Home.vue';
 import App from '../App.vue';
 
@@ -838,7 +838,7 @@ const routes = [
 ];
 
 const router = createRouter({
-    history: createWebHashHistory(),
+    history: createWebHistory(process.env.BASE_URL),
     routes,
     scrollBehavior (to, from, savedPosition) {
         if (savedPosition)
