diff --git a/common/framework/filters/htmlfilter.php b/common/framework/filters/htmlfilter.php
index c880a2e6a..dcb0c96db 100644
--- a/common/framework/filters/htmlfilter.php
+++ b/common/framework/filters/htmlfilter.php
@@ -235,6 +235,7 @@ class HTMLFilter
 			'preload' => 'Enum#auto,metadata,none',
 			'controls' => 'Bool',
 			'muted' => 'Bool',
+			'autoplay' => 'Bool',
 			'loop' => 'Bool',
 		));
 		$def->addElement('video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', array(
@@ -246,6 +247,7 @@ class HTMLFilter
 			'preload' => 'Enum#auto,metadata,none',
 			'controls' => 'Bool',
 			'muted' => 'Bool',
+			'autoplay' => 'Bool',
 			'loop' => 'Bool',
 		));
 		$def->addElement('source', 'Block', 'Empty', 'Common', array(
diff --git a/tests/unit/framework/filters/HTMLFilterTest.php b/tests/unit/framework/filters/HTMLFilterTest.php
index 790b044a6..d51755160 100644
--- a/tests/unit/framework/filters/HTMLFilterTest.php
+++ b/tests/unit/framework/filters/HTMLFilterTest.php
@@ -69,11 +69,11 @@ class HTMLFilterTest extends \Codeception\TestCase\Test
 	public function testHTMLFilterHTML5()
 	{
 		$source = '<div><audio autoplay="autoplay" src="./foo/bar.mp3"></audio></div>';
-		$target = '<div><audio src="./foo/bar.mp3"></audio></div>';
+		$target = '<div><audio autoplay="" src="./foo/bar.mp3"></audio></div>';
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 		
-		$source = '<video autoplay="autoplay" width="320" height="240"><source src="./foo/bar.mp4" type="video/mp4" /></video>';
-		$target = '<video width="320" height="240"><source src="./foo/bar.mp4" type="video/mp4" /></video>';
+		$source = '<video autoplay width="320" height="240"><source src="./foo/bar.mp4" type="video/mp4" /></video>';
+		$target = '<video autoplay="" width="320" height="240"><source src="./foo/bar.mp4" type="video/mp4" /></video>';
 		$this->assertEquals($target, Rhymix\Framework\Filters\HTMLFilter::clean($source));
 		
 		$source = '<nav>123</nav><section>456</section><article>789</article><aside>0</aside>';