diff --git a/src/vueTransform.js b/src/vueTransform.js
index 27f1b22..8af1a5a 100644
--- a/src/vueTransform.js
+++ b/src/vueTransform.js
@@ -54,9 +54,9 @@ async function processTemplate (source, id, content, options, nodes, modules) {
     const extras = { modules, id, lang: source.attrs.lang }
     const code = deIndent(source.code)
     const template = await (
-        options.disableCssModuleStaticReplacement !== true
-            ? templateProcessor(code, extras, options)
-            : code
+          options.disableCssModuleStaticReplacement !== true
+                ? templateProcessor(code, extras, options)
+                : code
     )
 
     if (!options.compileTemplate) {
@@ -134,10 +134,10 @@ async function processStyle (styles, id, content, options) {
             map: map,
             lang: style.attrs.lang || 'css',
             module: 'module' in style.attrs ? style.attrs.module || true : false,
-            scoped: 'scoped' in style.attrs ? style.attrs.scoped || true : false
+            scoped: 'scoped' in style.attrs
         }
 
-        outputs.push(options.autoStyles ? await compile(output, options) : output)
+        outputs.push(options.autoStyles || output.scoped || output.module ? await compile(output, options) : output)
     }
 
     return outputs
diff --git a/test/expects/scoped-css-with-no-auto-style.css b/test/expects/scoped-css-with-no-auto-style.css
new file mode 100644
index 0000000..7ad84e9
--- /dev/null
+++ b/test/expects/scoped-css-with-no-auto-style.css
@@ -0,0 +1,16 @@
+.scoped-css-with-no-auto-style__test2 {
+    color: red;
+}
+
+
+
+
+
+
+
+
+
+
+.test[data-v-0cd69708] {
+    color: red;
+}
diff --git a/test/expects/scoped-css-with-no-auto-style.js b/test/expects/scoped-css-with-no-auto-style.js
new file mode 100644
index 0000000..282db06
--- /dev/null
+++ b/test/expects/scoped-css-with-no-auto-style.js
@@ -0,0 +1,3 @@
+var scopedCssWithNoAutoStyle = { template: "<div class=\"test scoped-css-with-no-auto-style__test2\">Foo</div>",_scopeId: 'data-v-0cd69708',cssModules: {"test2":"scoped-css-with-no-auto-style__test2"},};
+
+export default scopedCssWithNoAutoStyle;
diff --git a/test/fixtures/scoped-css-with-no-auto-style.vue b/test/fixtures/scoped-css-with-no-auto-style.vue
new file mode 100644
index 0000000..0266b04
--- /dev/null
+++ b/test/fixtures/scoped-css-with-no-auto-style.vue
@@ -0,0 +1,19 @@
+<template>
+<div class="test test2">Foo</div>
+</template>
+
+<script lang="babel">
+export default {}
+</script>
+
+<style lang="css" scoped>
+.test {
+    color: red;
+}
+</style>
+
+<style lang="css" module>
+.test2 {
+    color: red;
+}
+</style>
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index b7e2e7c..9f881f6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -33,13 +33,14 @@ function test(name) {
                 modules: {
                     generateScopedName: '[name]__[local]'
                 },
-              compileTemplate: [
-                  'compileTemplate',
-                  'compileTemplateLocalComponent',
-                  'slot',
-                  'table',
-                  'table-n-slot'
-              ].indexOf(name) > -1
+                compileTemplate: [
+                    'compileTemplate',
+                    'compileTemplateLocalComponent',
+                    'slot',
+                    'table',
+                    'table-n-slot'
+                ].indexOf(name) > -1,
+                autoStyles: ['scoped-css-with-no-auto-style'].indexOf(name) < 0
             })]
         }).then(function (bundle) {
             var result = bundle.generate({ format: 'es' })
@@ -47,7 +48,17 @@ function test(name) {
             assert.equal(code.trim(), expected.trim(), 'should compile code correctly')
 
             // Check css output
-            if (['style', 'css-modules', 'css-modules-static', 'scoped-css', 'scss', 'pug', 'less', 'stylus'].indexOf(name) > -1) {
+            if ([
+                      'style',
+                      'css-modules',
+                      'css-modules-static',
+                      'scoped-css',
+                      'scoped-css-with-no-auto-style',
+                      'scss',
+                      'pug',
+                      'less',
+                      'stylus'
+                  ].indexOf(name) > -1) {
                 var css = read('expects/' + name + '.css')
                 assert.equal(css.trim(), actualCss.trim(), 'should output style tag content')
             } else if (['no-css-extract'].indexOf(name) > -1) {
@@ -96,3 +107,4 @@ describe('styleToImports', function () {
         })
     })
 })
+