diff --git a/packages/@angular/cli/models/webpack-configs/production.ts b/packages/@angular/cli/models/webpack-configs/production.ts
index 7535e7417961..5b1e319fda4b 100644
--- a/packages/@angular/cli/models/webpack-configs/production.ts
+++ b/packages/@angular/cli/models/webpack-configs/production.ts
@@ -72,8 +72,11 @@ export const getProdConfig = function (wco: WebpackConfigOptions) {
     // Load the Webpack plugin for manifest generation and install it.
     const AngularServiceWorkerPlugin = require('@angular/service-worker/build/webpack')
       .AngularServiceWorkerPlugin;
+
+    // Add baseHref in manifest and ignore system files
     extraPlugins.push(new AngularServiceWorkerPlugin({
       baseHref: buildOptions.baseHref || '/',
+      'static.ignore': ['^\\.DS_Store$', '^Thumbs\\.db$'],
     }));
 
     // Copy the worker script into assets.