diff --git a/content-controllers/image/image.controller.php b/content-controllers/image/image.controller.php
index 33a4a68..6c92102 100644
--- a/content-controllers/image/image.controller.php
+++ b/content-controllers/image/image.controller.php
@@ -123,7 +123,7 @@ public function handleHash($hash,$url)
                 }
             }
 
-            if( (in_array('webp',$url) && $type!='webp') || ( $this->shouldAlwaysBeWebp() && $type=='jpg' ) )
+            if( (in_array('webp',$url) && $type!='webp') || ( $this->shouldAlwaysBeWebp() && ($type=='jpg' || $type=='png') ) )
                 $modifiers['webp'] = true;
             if(in_array('forcesize',$url) && $modifiers['size'])
                 $modifiers['forcesize'] = true;