diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
index e0860ec498e0..06b5933803ee 100644
--- a/packages/@angular/cli/tasks/serve.ts
+++ b/packages/@angular/cli/tasks/serve.ts
@@ -164,6 +164,7 @@ export default Task.extend({
       },
       contentBase: false,
       public: serveTaskOptions.publicHost,
+      publicPath: serveTaskOptions.baseHref,
       disableHostCheck: serveTaskOptions.disableHostCheck
     };