diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a6754ea0..50df8d939 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [3.9.1] - 2022-12-31
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#787](https://github.com/shlinkio/shlink-web-client/issues/787) Fixed wrong base path set in vite config when homepage is set as empty string.
+
+
 ## [3.9.0] - 2022-12-31
 ### Added
 * [#750](https://github.com/shlinkio/shlink-web-client/issues/750) Added new icon indicators telling if a short URL can be normally visited, it received the max amount of visits, is still not enabled, etc.
diff --git a/vite.config.ts b/vite.config.ts
index 2b0cf2616..9d6f04c79 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,7 +4,8 @@ import { VitePWA } from 'vite-plugin-pwa';
 import { manifest } from './manifest';
 import pack from './package.json';
 
-// https://vitejs.dev/config/
+const homepage = pack.homepage?.trim();
+
 export default defineConfig({
   plugins: [react(), VitePWA({
     mode: process.env.NODE_ENV === 'development' ? 'development' : 'production',
@@ -21,5 +22,5 @@ export default defineConfig({
   server: {
     port: 3000,
   },
-  base: pack.homepage ?? '/',
+  base: !homepage ? undefined : homepage, // Not using just homepage because empty string should be discarded
 });