diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index c72793f17..a12e2e0e9 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4792,7 +4792,10 @@ class e_parser
 
 		$mime = varset($parm['mime'], 'audio/mpeg');
 
-		$text = '<audio controls style="max-width:100%">
+		$autoplay = !empty($parm['autoplay']) ? "autoplay " : "";
+		$controls = !empty($parm['controls']) ? "controls" : "";
+
+		$text = '<audio controls style="max-width:100%" '.$autoplay.$controls.'>
 					<source src="'.$file.'" type="'.$mime .'">
 					  Your browser does not support the audio tag.
 				</audio>';