diff --git a/src/compiler/preprocess/index.ts b/src/compiler/preprocess/index.ts
index 1a13b869e7..d90d4814d7 100644
--- a/src/compiler/preprocess/index.ts
+++ b/src/compiler/preprocess/index.ts
@@ -94,8 +94,8 @@ export default async function preprocess(
 	for (const fn of script) {
 		source = await replace_async(
 			source,
-			/<!--[^]*?-->|<script(\s[^]*?)?>([^]*?)<\/script>/gi,
-			async (match, attributes = '', content) => {
+			/<!--[^]*?-->|<script(\s[^]*?)?(?:>([^]*?)<\/script>|\/>)/gi,
+			async (match, attributes = '', content = '') => {
 				if (!attributes && !content) {
 					return match;
 				}
@@ -114,8 +114,8 @@ export default async function preprocess(
 	for (const fn of style) {
 		source = await replace_async(
 			source,
-			/<!--[^]*?-->|<style(\s[^]*?)?>([^]*?)<\/style>/gi,
-			async (match, attributes = '', content) => {
+			/<!--[^]*?-->|<style(\s[^]*?)?(?:>([^]*?)<\/style>|\/>)/gi,
+			async (match, attributes = '', content = '') => {
 				if (!attributes && !content) {
 					return match;
 				}
diff --git a/test/preprocess/samples/script-self-closing/_config.js b/test/preprocess/samples/script-self-closing/_config.js
new file mode 100644
index 0000000000..4baab9730e
--- /dev/null
+++ b/test/preprocess/samples/script-self-closing/_config.js
@@ -0,0 +1,12 @@
+import * as assert from "assert";
+
+export default {
+	preprocess: {
+		script: ({ content, attributes }) => {
+			assert.equal(content, "");
+			return {
+				code: `console.log("${attributes["the-answer"]}");`
+			};
+		}
+	}
+};
diff --git a/test/preprocess/samples/script-self-closing/input.svelte b/test/preprocess/samples/script-self-closing/input.svelte
new file mode 100644
index 0000000000..c5816cb3ba
--- /dev/null
+++ b/test/preprocess/samples/script-self-closing/input.svelte
@@ -0,0 +1 @@
+<script the-answer="42"/>
\ No newline at end of file
diff --git a/test/preprocess/samples/script-self-closing/output.svelte b/test/preprocess/samples/script-self-closing/output.svelte
new file mode 100644
index 0000000000..2912876880
--- /dev/null
+++ b/test/preprocess/samples/script-self-closing/output.svelte
@@ -0,0 +1 @@
+<script the-answer="42">console.log("42");</script>
\ No newline at end of file
diff --git a/test/preprocess/samples/style-self-closing/_config.js b/test/preprocess/samples/style-self-closing/_config.js
new file mode 100644
index 0000000000..0a05cd3d64
--- /dev/null
+++ b/test/preprocess/samples/style-self-closing/_config.js
@@ -0,0 +1,12 @@
+import * as assert from "assert";
+
+export default {
+	preprocess: {
+		style: ({ content, attributes: { color } }) => {
+			assert.equal(content, "");
+			return {
+				code: `div { color: ${color}; }`
+			};
+		}
+	}
+};
diff --git a/test/preprocess/samples/style-self-closing/input.svelte b/test/preprocess/samples/style-self-closing/input.svelte
new file mode 100644
index 0000000000..07176c87e5
--- /dev/null
+++ b/test/preprocess/samples/style-self-closing/input.svelte
@@ -0,0 +1,3 @@
+<div class='brand-color'>$brand</div>
+
+<style color="red"/>
\ No newline at end of file
diff --git a/test/preprocess/samples/style-self-closing/output.svelte b/test/preprocess/samples/style-self-closing/output.svelte
new file mode 100644
index 0000000000..c376cd00cb
--- /dev/null
+++ b/test/preprocess/samples/style-self-closing/output.svelte
@@ -0,0 +1,3 @@
+<div class='brand-color'>$brand</div>
+
+<style color="red">div { color: red; }</style>
\ No newline at end of file