diff --git a/scss/compiler.py b/scss/compiler.py
index 7b8dbd16..0c009190 100644
--- a/scss/compiler.py
+++ b/scss/compiler.py
@@ -784,7 +784,11 @@ def _at_content(self, calculator, rule, scope, block):
         """
         if '@content' not in rule.options:
             log.error("Content string not found for @content (%s)", rule.file_and_line)
-        rule.unparsed_contents = rule.options.pop('@content', '')
+        content = rule.options.pop('@content', '')
+        if content is None:
+            rule.unparsed_contents = ''
+        else:
+            rule.unparsed_contents = content
         self.manage_children(rule, scope)
 
     # @print_timing(10)
diff --git a/scss/tests/files/general/mixin-empty-content.css b/scss/tests/files/general/mixin-empty-content.css
new file mode 100644
index 00000000..3c895cd8
--- /dev/null
+++ b/scss/tests/files/general/mixin-empty-content.css
@@ -0,0 +1,3 @@
+a {
+  color: blue;
+}
diff --git a/scss/tests/files/general/mixin-empty-content.scss b/scss/tests/files/general/mixin-empty-content.scss
new file mode 100644
index 00000000..e4cc2089
--- /dev/null
+++ b/scss/tests/files/general/mixin-empty-content.scss
@@ -0,0 +1,9 @@
+@mixin test() {
+  @content;
+
+  a {
+    color: blue;
+  }
+}
+
+@include test();