diff --git a/technologies/matrix-detect.yaml b/technologies/matrix-detect.yaml
index 9fc3277db6..cb87bcf210 100644
--- a/technologies/matrix-detect.yaml
+++ b/technologies/matrix-detect.yaml
@@ -1,7 +1,7 @@
-id: matrix-server-detect
+id: matrix-detect
 
 info:
-  name: Detect a Matrix server
+  name: Matrix Server Detect
   author: erethon
   severity: info
   description: Detects Matrix servers based on .well-known entries. See https://en.wikipedia.org/wiki/Matrix_(protocol)
@@ -16,25 +16,34 @@ requests:
 
     matchers-condition: and
     matchers:
-      - type: status
-        status:
-          - 200
+
       - type: word
         part: body
         words:
           - "m."
 
+      - type: word
+        part: header
+        words:
+          - "text/plain"
+
+      - type: status
+        status:
+          - 200
+
     extractors:
       - type: json
         part: body
         name: server-to-server
         json:
           - '."m.server" | select( . != null )'
+
       - type: json
         part: body
         name: client-homeserver
         json:
           - '."m.homeserver" | .base_url | select( . != null )'
+
       - type: json
         part: body
         name: identity-server