diff --git a/packages/blocks/blocksAntd/src/blocks/Breadcrumb/Breadcrumb.js b/packages/blocks/blocksAntd/src/blocks/Breadcrumb/Breadcrumb.js
index fd4a63c22..eaa7faba2 100644
--- a/packages/blocks/blocksAntd/src/blocks/Breadcrumb/Breadcrumb.js
+++ b/packages/blocks/blocksAntd/src/blocks/Breadcrumb/Breadcrumb.js
@@ -24,7 +24,7 @@ import Icon from '../Icon/Icon';
 const ItemLink = ({ link, children, className }) => {
   if (type.isString(link.pageId)) {
     return (
-      <Link to={`/${link.pageId}`} className={className}>
+      <Link to={`${link.pageId}`} className={className}>
         {children}
       </Link>
     );
diff --git a/packages/blocks/blocksAntd/src/blocks/Menu/Menu.js b/packages/blocks/blocksAntd/src/blocks/Menu/Menu.js
index 66a9e3fc2..f00439cda 100644
--- a/packages/blocks/blocksAntd/src/blocks/Menu/Menu.js
+++ b/packages/blocks/blocksAntd/src/blocks/Menu/Menu.js
@@ -34,7 +34,7 @@ const getTitle = (id, properties, defaultTitle) =>
 
 const MenuTitle = ({ id, makeCssClass, pageId, properties, url, linkStyle }) =>
   type.isString(pageId) ? (
-    <Link to={`/${pageId}`} className={makeCssClass([linkStyle])}>
+    <Link to={`${pageId}`} className={makeCssClass([linkStyle])}>
       {getTitle(id, properties, pageId)}
     </Link>
   ) : type.isString(url) ? (
diff --git a/packages/blocks/blocksAntd/src/blocks/PageHeaderMenu/PageHeaderMenu.js b/packages/blocks/blocksAntd/src/blocks/PageHeaderMenu/PageHeaderMenu.js
index 42c5ccf45..cfadc247c 100644
--- a/packages/blocks/blocksAntd/src/blocks/PageHeaderMenu/PageHeaderMenu.js
+++ b/packages/blocks/blocksAntd/src/blocks/PageHeaderMenu/PageHeaderMenu.js
@@ -114,7 +114,7 @@ const PageHeaderMenu = ({
               content={{
                 content: () => (
                   <>
-                    <Link to={`/${homePageId}`}>
+                    <Link to={`${homePageId}`}>
                       <img
                         src={
                           (properties.logo && properties.logo.src) ||
diff --git a/packages/servers/serverDev/src/server.js b/packages/servers/serverDev/src/server.js
index e39c1e78d..daf01ce7f 100644
--- a/packages/servers/serverDev/src/server.js
+++ b/packages/servers/serverDev/src/server.js
@@ -24,8 +24,7 @@ dotenv.config({ silent: true });
 const buildDirectory = process.env.LOWDEFY_SERVER_BUILD_DIRECTORY || './.lowdefy/build';
 const publicDirectory = process.env.LOWDEFY_SERVER_PUBLIC_DIRECTORY || defaultPublicDirectory;
 const port = parseInt(process.env.LOWDEFY_SERVER_PORT) || 3000;
-// const serverBasePath = process.env.LOWDEFY_SERVER_BASE_PATH;
-const serverBasePath = '/base';
+const serverBasePath = process.env.LOWDEFY_SERVER_BASE_PATH || '';
 
 const server = getServer({
   buildDirectory,