diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 5c0176ea3..9d03bf2b0 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4774,9 +4774,8 @@ class e_parser
 		{
 			$parm['type'] = 'webp';
 			$source = $tp->thumbUrl($file,$parm);
-			$html = "<picture>\n";
-			$html .= '<source type="image/webp" srcset="'.$source.'">';
-			$html .= "\n";
+			$html = "<picture class=\"{$class}\">\n";
+
 			if(!empty($parm['srcset']))
 			{
 				list($webPSourceSet,$webPSize) = explode(' ', $parm['srcset']);
@@ -4786,6 +4785,9 @@ class e_parser
 				$html .= "\n";
 				$srcset = ''; // remove it from the img tag below.
 			}
+
+			$html .= '<source type="image/webp" srcset="'.$source.'">';
+			$html .= "\n";
 		}
 
 		$html .= "<img {$id}class=\"{$class}\" src=\"".$path."\" alt=\"".$alt."\" ".$srcset.$width.$height.$style.$loading.$title." />";
diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php
index b9245ba5d..24f33b903 100644
--- a/e107_tests/tests/unit/e_parseTest.php
+++ b/e107_tests/tests/unit/e_parseTest.php
@@ -990,10 +990,10 @@ while(&#036;row = &#036;sql-&gt;fetch())
 			$result6 = $this->tp->toImage($src);
 
 
-			$expected = '<picture>
-<source type="image/webp" srcset="thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&amp;w=80&amp;h=80&amp;type=webp">
+			$expected = '<picture class="img-responsive img-fluid">
 <source type="image/webp" srcset="thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&amp;w=320&amp;h=320&amp;type=webp 4x">
 <source type="image/jpeg" srcset="thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&amp;w=320&amp;h=320 4x">
+<source type="image/webp" srcset="thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&amp;w=80&amp;h=80&amp;type=webp">
 <img class="img-responsive img-fluid" src="thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&amp;w=80&amp;h=80" alt="butterfly.jpg" width="80" height="80"  />
 </picture>';