diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index f3f2783b8..74bb20050 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3449,9 +3449,12 @@ class e_parser
 
 		if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false) //v2.x path.
 		{
-			$path = $tp->thumbUrl($file,null,null);
+			$path = $tp->thumbUrl($file,$parm,null);
 
-			$parm['srcset'] = $tp->thumbSrcSet($file, '2x');
+			if(empty($parm['x']))
+			{
+				$parm['srcset'] = $tp->thumbSrcSet($file, '2x');
+			}
 
 			if(empty($parm['w']))
 			{