diff --git a/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
index 2637aa59..382b7c9f 100644
--- a/data/api/client-server/content-repo.yaml
+++ b/data/api/client-server/content-repo.yaml
@@ -605,6 +605,7 @@ components:
       example: matrix.org
       schema:
         type: string
+        format: mx-server-name
     mediaId:
       in: path
       name: mediaId
diff --git a/data/custom-formats.yaml b/data/custom-formats.yaml
index 2075c146..53432232 100644
--- a/data/custom-formats.yaml
+++ b/data/custom-formats.yaml
@@ -37,6 +37,11 @@ mx-room-id:
   url: /appendices#room-ids
   # regex: "^!"
 
+mx-server-name:
+  title: Server Name
+  url: /appendices#server-name
+  # no regex
+
 uri:
   title: URI
   url: http://tools.ietf.org/html/rfc3986