diff --git a/src/server/template-renderer/create-async-file-mapper.js b/src/server/template-renderer/create-async-file-mapper.js
index 64c0647a3ed..c989e33b9a4 100644
--- a/src/server/template-renderer/create-async-file-mapper.js
+++ b/src/server/template-renderer/create-async-file-mapper.js
@@ -43,8 +43,8 @@ function mapIdToFile (id, clientManifest) {
   if (fileIndices) {
     fileIndices.forEach(index => {
       const file = clientManifest.all[index]
-      // only include async files or non-js assets
-      if (clientManifest.async.indexOf(file) > -1 || !(/\.js($|\?)/.test(file))) {
+      // only include async files or non-js, non-css assets
+      if (clientManifest.async.indexOf(file) > -1 || !(/\.(js|css)($|\?)/.test(file))) {
         files.push(file)
       }
     })