diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index 87f9dbb82a..b319958010 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -116,9 +116,7 @@ module.exports = (api, options) => {
       protocol,
       host,
       port,
-      isAbsoluteUrl(options.publicPath) || options.publicPath === 'auto'
-        ? '/'
-        : options.publicPath
+      isAbsoluteUrl(process.env.BASE_URL) ? '/' : process.env.BASE_URL
     )
     const localUrlForBrowser = publicUrl || urls.localUrlForBrowser
 
@@ -189,7 +187,7 @@ module.exports = (api, options) => {
           'text/html',
           'application/xhtml+xml'
         ],
-        rewrites: genHistoryApiFallbackRewrites(options.publicPath, options.pages)
+        rewrites: genHistoryApiFallbackRewrites(process.env.BASE_URL, options.pages)
       },
       hot: !isProduction
     }, projectDevServerOptions, {
diff --git a/packages/@vue/cli-service/lib/util/resolveClientEnv.js b/packages/@vue/cli-service/lib/util/resolveClientEnv.js
index 2aa83f1554..b6ce9824b9 100644
--- a/packages/@vue/cli-service/lib/util/resolveClientEnv.js
+++ b/packages/@vue/cli-service/lib/util/resolveClientEnv.js
@@ -7,7 +7,7 @@ module.exports = function resolveClientEnv (options, raw) {
       env[key] = process.env[key]
     }
   })
-  env.BASE_URL = options.publicPath
+  env.BASE_URL = options.publicPath === 'auto' ? '' : options.publicPath
 
   if (raw) {
     return env