diff --git a/lib/server/generate.js b/lib/server/generate.js
index 8aec19a45c..22e5a0563d 100644
--- a/lib/server/generate.js
+++ b/lib/server/generate.js
@@ -255,7 +255,10 @@ function execute() {
   /* copy all static files from user */
   files = glob.sync(CWD + "/static/**");
   files.forEach(file => {
-    if (file.match(/\.css$/)) {
+    if (
+      file.match(/\.css$/) &&
+      siteConfig.separateCss.indexOf(path.basename(file)) == -1
+    ) {
       const mainCss =
         __dirname +
         "/../../build" +
diff --git a/lib/server/server.js b/lib/server/server.js
index 46c24eaec3..97f6db8981 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -354,6 +354,9 @@ function execute(port) {
     let files = glob.sync(CWD + "/static/**/*.css");
 
     files.forEach(file => {
+      if (siteConfig.separateCss.indexOf(path.basename(file)) != -1) {
+        return;
+      }
       cssContent =
         cssContent + "\n" + fs.readFileSync(file, { encoding: "utf8" });
     });
diff --git a/package.json b/package.json
index 01fb8e0a13..09efec7a19 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "shelljs": "^0.7.8"
   },
   "name": "docusaurus",
-  "version": "1.0.0-alpha.23",
+  "version": "1.0.0-alpha.24",
   "bin": {
     "docusaurus-start": "./lib/start-server.js",
     "docusaurus-build": "./lib/build-files.js",