diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index e4607ad5a6..7c5e617569 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -1106,14 +1106,12 @@ Model::SupportsMimeType(const char* type, const BObjectList<BString>* list,
 
 		int32 match;
 
-		if (type) {
+		if (type || (list != NULL && list->IsEmpty())) {
 			BString typeString(type);
 			match = MatchMimeTypeString(&typeString, mimeSignature);
 		} else {
-			if (list != NULL && !list->IsEmpty()) {
-				match = WhileEachListItem(const_cast<BObjectList<BString>*>(list),
-					MatchMimeTypeString, mimeSignature);
-			}
+			match = WhileEachListItem(const_cast<BObjectList<BString>*>(list),
+				MatchMimeTypeString, mimeSignature);
 			// const_cast shouldnt be here, have to have it until
 			// MW cleans up
 		}