diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index 1352464d4e..9219e23681 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -428,6 +428,10 @@ export default class Block {
 			this.has_animation;
 	}
 
+	has_only_spaces(): boolean {
+		return this.wrappers.every(w => w.has_only_spaces());
+	}
+
 	render() {
 		const key = this.key && this.get_unique_name('key');
 
diff --git a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index be3d6d146d..ba31a8c23c 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -151,7 +151,9 @@ export default class InlineComponentWrapper extends Wrapper {
 
 		// removing empty slot
 		for (const slot of this.slots.keys()) {
-			if (!this.slots.get(slot).block.has_content()) {
+			const bl = this.slots.get(slot).block;
+
+			if (!bl.has_content() || (slot === 'default' && bl.has_only_spaces())) {
 				this.renderer.remove_block(this.slots.get(slot).block);
 				this.slots.delete(slot);
 			}
diff --git a/src/compiler/compile/render_dom/wrappers/Text.ts b/src/compiler/compile/render_dom/wrappers/Text.ts
index daa3ccfd20..98884d995d 100644
--- a/src/compiler/compile/render_dom/wrappers/Text.ts
+++ b/src/compiler/compile/render_dom/wrappers/Text.ts
@@ -40,6 +40,10 @@ export default class TextWrapper extends Wrapper {
 		return true;
 	}
 
+	has_only_spaces() {
+		return !/\S/.test(this.data);
+	}
+
 	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
 		if (this.skip) return;
 		const use_space = this.use_space();
diff --git a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
index 4bf8c20bd8..5cb8bbada6 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
@@ -85,6 +85,10 @@ export default class Wrapper {
 		);
 	}
 
+	has_only_spaces() {
+		return false;
+	}
+
 	render(_block: Block, _parent_node: Identifier, _parent_nodes: Identifier) {
 		throw Error('Wrapper class is not renderable');
 	}
diff --git a/src/compiler/compile/render_ssr/handlers/InlineComponent.ts b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
index e5afbf59cc..a40e14bbd6 100644
--- a/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
+++ b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
@@ -4,6 +4,8 @@ import { get_slot_scope } from './shared/get_slot_scope';
 import InlineComponent from '../../nodes/InlineComponent';
 import remove_whitespace_children from './utils/remove_whitespace_children';
 import { p, x } from 'code-red';
+import { TemplateLiteral } from 'estree';
+
 
 function get_prop_value(attribute) {
 	if (attribute.is_true) return x`true`;
@@ -85,7 +87,7 @@ export default function(node: InlineComponent, renderer: Renderer, options: Rend
 		});
 
 		slot_scopes.forEach(({ input, output }, name) => {
-			if (!is_empty_template_literal(output)) {
+			if (!is_empty_template_literal(output) && (name !== 'default' || !has_only_spaces(output))) {
 				slot_fns.push(
 					p`${name}: (${input}) => ${output}`
 				);
@@ -100,10 +102,16 @@ export default function(node: InlineComponent, renderer: Renderer, options: Rend
 	renderer.add_expression(x`@validate_component(${expression}, "${node.name}").$$render($$result, ${props}, ${bindings}, ${slots})`);
 }
 
-function is_empty_template_literal(template_literal) {
+function is_empty_template_literal(template_literal: TemplateLiteral) {
 	return (
 		template_literal.expressions.length === 0 &&
 		template_literal.quasis.length === 1 &&
 		template_literal.quasis[0].value.raw === ''
 	);
 }
+
+function has_only_spaces(template_literal: TemplateLiteral): boolean {
+	return template_literal.expressions.length === 0 &&
+		template_literal.quasis.length === 1 &&
+		!/\S/.test(template_literal.quasis[0].value.raw);
+}
diff --git a/test/runtime/samples/component-slot-warning/main.svelte b/test/runtime/samples/component-slot-warning/main.svelte
index c29ef3e85b..8c114876bd 100644
--- a/test/runtime/samples/component-slot-warning/main.svelte
+++ b/test/runtime/samples/component-slot-warning/main.svelte
@@ -4,4 +4,5 @@
 <Nested>
 	<input slot="slot1">
 	<input slot="slot2">
+	unexpected_default
 </Nested>
diff --git a/test/runtime/samples/slot-spaces-only/Component.svelte b/test/runtime/samples/slot-spaces-only/Component.svelte
new file mode 100644
index 0000000000..c631c3203a
--- /dev/null
+++ b/test/runtime/samples/slot-spaces-only/Component.svelte
@@ -0,0 +1,7 @@
+<script>
+
+</script>
+
+<slot name='slotA'/>
+<slot name='slotB'/>
+<slot>default value</slot>
\ No newline at end of file
diff --git a/test/runtime/samples/slot-spaces-only/_config.js b/test/runtime/samples/slot-spaces-only/_config.js
new file mode 100644
index 0000000000..dd06c1e7d0
--- /dev/null
+++ b/test/runtime/samples/slot-spaces-only/_config.js
@@ -0,0 +1,7 @@
+export default {
+	html: `
+    <div slot='slotA'>A</div>
+    <div slot='slotB'>B</div>
+    default value
+    `
+};
diff --git a/test/runtime/samples/slot-spaces-only/main.svelte b/test/runtime/samples/slot-spaces-only/main.svelte
new file mode 100644
index 0000000000..acce1fdf45
--- /dev/null
+++ b/test/runtime/samples/slot-spaces-only/main.svelte
@@ -0,0 +1,12 @@
+<script>
+    import Component from './Component.svelte';
+</script>
+
+<Component>
+    
+    
+    <div slot='slotA'>A</div>
+    <div slot='slotB'>B</div>
+
+
+</Component>
\ No newline at end of file