diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index ca39810e3d6..20630c487f7 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -190,7 +190,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 	        	$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
 	        	if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
 
-	        	if ($upload_dir != $publicmediasdirwithslash) {	// We never add .noexe on files into media directory
+	        	if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
 		            $filenameto .= '.noexe';
 	        	}
 	        }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3e3c9482187..74798a37e85 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1049,7 +1049,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
 			if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
 
-			if ($upload_dir != $publicmediasdirwithslash) {	// We never add .noexe on files into media directory
+			if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
 				$file_name .= '.noexe';
 				$successcode = 2;
 			}