diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index d1193b7a36..cebbccd6ad 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -233,7 +233,10 @@ class Detection implements IMimeTypeDetector {
 			if ($info) {
 				$info = strtolower($info);
 				$mimeType = strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
-				return $this->getSecureMimeType($mimeType);
+				$mimeType = $this->getSecureMimeType($mimeType);
+				if ($mimeType !== 'application/octet-stream') {
+					return $mimeType;
+				}
 			}
 		}
 
@@ -246,7 +249,10 @@ class Detection implements IMimeTypeDetector {
 			// use mime magic extension if available
 			$mimeType = mime_content_type($path);
 			if ($mimeType !== false) {
-				return $this->getSecureMimeType($mimeType);
+				$mimeType = $this->getSecureMimeType($mimeType);
+				if ($mimeType !== 'application/octet-stream') {
+					return $mimeType;
+				}
 			}
 		}
 
@@ -261,7 +267,10 @@ class Detection implements IMimeTypeDetector {
 			if ($mimeType !== false) {
 				//trim the newline
 				$mimeType = trim($mimeType);
-				return $this->getSecureMimeType($mimeType);
+				$mimeType = $this->getSecureMimeType($mimeType);
+				if ($mimeType !== 'application/octet-stream') {
+					return $mimeType;
+				}
 			}
 
 		}