diff --git a/flextype/parsers/FrontmatterParser.php b/flextype/parsers/FrontmatterParser.php
index 74b208b1..53160eb9 100644
--- a/flextype/parsers/FrontmatterParser.php
+++ b/flextype/parsers/FrontmatterParser.php
@@ -33,10 +33,10 @@ class FrontmatterParser
     {
         $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL . ltrim($content));
         if (count($parts) < 3) {
-            return ['content' => $content];
+            return ['content' => trim($content)];
         }
 
-        return YamlParser::decode(trim($parts[1])) + ['content' => implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2))];
+        return YamlParser::decode(trim($parts[1])) + ['content' => trim(implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2)))];
     }
 
     public static function encode($input) : string