diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 1352963fc67f1..4e7f89778a4b7 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -120,8 +120,14 @@ public function registerTypeArray(array $types): void {
 		$this->mimetypes = array_merge($this->mimetypes, $types);
 
 		// Update the alternative mimetypes to avoid having to look them up each time.
-		foreach ($this->mimetypes as $mimeType) {
+		foreach ($this->mimetypes as $extension => $mimeType) {
+			if (strpos($extension, '_comment') === 0) {
+				continue;
+			}
 			$this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?? $mimeType[0];
+			if (isset($mimeType[1])) {
+				$this->secureMimeTypes[$mimeType[1]] = $mimeType[1];
+			}
 		}
 	}
 
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 59f0e0a17cbe4..70f87c280dea8 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -132,7 +132,7 @@
 	"pdf": ["application/pdf"],
 	"pfb": ["application/x-font"],
 	"pef": ["image/x-dcraw"],
-	"php": ["application/x-php"],
+	"php": ["application/x-php", "text/x-php"],
 	"pl": ["application/x-perl"],
 	"pls": ["audio/x-scpls"],
 	"png": ["image/png"],