diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 89a07b71b..5094585cb 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -114,9 +114,15 @@
 				if(file_exists("{$file->fileRealPath}/{$tmp}"))
 				{
 					$file->fileName = $tmp;
+					$file->useMin = TRUE;
 				}
 			}
 
+			if(!$file->useMin && !file_exists("{$file->fileRealPath}/{$file->fileName}"))
+			{
+				$file->fileName = "{$file->fileNameNoExt}.min.{$file->fileExtension}";
+			}
+
 			if (strpos($file->filePath, '://') == false)
 			{
 				$file->useCdn = $useCdn;