diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 59204e656..e4fe59d60 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -5112,6 +5112,11 @@ class e_parse
 			$height = varset($parm['h'], 240);
 			$mime = varset($parm['mime'], 'video/mp4');
 
+			if($height === 0)
+			{
+				$height = 'auto';
+			}
+
 			return '
 			<div class="video-responsive">
 			<video width="' . $width . '" height="' . $height . '" controls>
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 852434c5b..063b62771 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -1267,7 +1267,8 @@ class e_media
 		{
 
 			case "video":
-				$preview = $tp->toVideo($default, array('w'=>$width, 'h'=> ($height - 50)));
+				$h = (!is_numeric($height) || $height < 1) ? 0 : ($height - 50);
+				$preview = $tp->toVideo($default, array('w'=>$width, 'h'=>$h ));
 			break;
 
 			case "audio":
diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php
index 1def8c9cf..492394f86 100644
--- a/e107_tests/tests/unit/e_parseTest.php
+++ b/e107_tests/tests/unit/e_parseTest.php
@@ -2680,11 +2680,43 @@ Your browser does not support the audio tag.
 
 	}
 
-	/*
-			public function testToVideo()
-			{
 
-			}*/
+	public function testToVideo()
+	{
+		$tests = [
+			0 => [
+				'file'      => '{e_MEDIA}myfile.mp4',
+				'parms'     =>[],
+				'expected'  => '<video width="320" height="240" controls>'
+				],
+
+			1 => [
+				'file'      => '{e_MEDIA}myfile.mp4',
+				'parms'     =>['w'=>500],
+				'expected'  => '<video width="500" height="240" controls>'
+				],
+
+			2 => [
+				'file'      => '{e_MEDIA}myfile.mp4',
+				'parms'     =>['w'=>300, 'h'=>0],
+				'expected'  => '<video width="300" height="auto" controls>'
+				],
+
+			3 => [
+				'file'      => '{e_MEDIA}myfile.mp4',
+				'parms'     =>['w'=>300, 'h'=>'auto'],
+				'expected'  => '<video width="300" height="auto" controls>'
+				],
+		];
+
+		foreach ($tests as $index => $var)
+		{
+			$result = $this->tp->toVideo($var['file'], $var['parms']);
+			self::assertStringContainsString($var['expected'], $result, 'Failed on index #'.$index);
+		}
+
+
+	}
 
 	public function testMakeClickable()
 	{