diff --git a/api/client-server/administrative_contact.yaml b/api/client-server/administrative_contact.yaml
index e7381a555..8f0319d5a 100644
--- a/api/client-server/administrative_contact.yaml
+++ b/api/client-server/administrative_contact.yaml
@@ -129,6 +129,8 @@ paths:
                 "errcode": "M_THREEPID_AUTH_FAILED",
                 "error": "The third party credentials could not be verified by the identity server."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - User data
   "/account/3pid/email/requestToken":
diff --git a/api/client-server/banning.yaml b/api/client-server/banning.yaml
index 3877f0e90..9aceb2db8 100644
--- a/api/client-server/banning.yaml
+++ b/api/client-server/banning.yaml
@@ -82,6 +82,8 @@ paths:
                 "errcode": "M_FORBIDDEN",
                 "error": "You do not have a high enough power level to ban from this room."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - Room membership
   "/rooms/{roomId}/unban":
@@ -133,5 +135,7 @@ paths:
                 "errcode": "M_FORBIDDEN",
                 "error": "You do not have a high enough power level to unban from this room."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - Room membership
diff --git a/api/client-server/create_room.yaml b/api/client-server/create_room.yaml
index 3e88ee0c0..59f7f75f0 100644
--- a/api/client-server/create_room.yaml
+++ b/api/client-server/create_room.yaml
@@ -218,6 +218,8 @@ paths:
               invalid: for example, the user's ``power_level`` is set below
               that necessary to set the room name (``errcode`` set to
               ``M_INVALID_ROOM_STATE``).
+          schema:
+            "$ref": "definitions/errors/error.yaml"
 
       tags:
         - Room creation
diff --git a/api/client-server/directory.yaml b/api/client-server/directory.yaml
index a50bab629..ee42cf845 100644
--- a/api/client-server/directory.yaml
+++ b/api/client-server/directory.yaml
@@ -68,6 +68,8 @@ paths:
                 "errcode": "M_UNKNOWN",
                 "error": "Room alias #monkeys:matrix.org already exists."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - Room directory
     get:
@@ -118,6 +120,8 @@ paths:
                 "errcode": "M_NOT_FOUND",
                 "error": "Room alias #monkeys:matrix.org not found."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - Room directory
     delete:
diff --git a/api/client-server/inviting.yaml b/api/client-server/inviting.yaml
index 1e6694dc8..f312d5ceb 100644
--- a/api/client-server/inviting.yaml
+++ b/api/client-server/inviting.yaml
@@ -93,6 +93,8 @@ paths:
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN", "error": "@cheeky_monkey:matrix.org is banned from the room"}
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/joining.yaml b/api/client-server/joining.yaml
index 9890e73ca..2a2a4c687 100644
--- a/api/client-server/joining.yaml
+++ b/api/client-server/joining.yaml
@@ -110,6 +110,8 @@ paths:
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN", "error": "You are not invited to this room."}
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
@@ -206,6 +208,8 @@ paths:
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN", "error": "You are not invited to this room."}
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/kicking.yaml b/api/client-server/kicking.yaml
index ef43c0ee9..9be5dc79f 100644
--- a/api/client-server/kicking.yaml
+++ b/api/client-server/kicking.yaml
@@ -81,5 +81,7 @@ paths:
                 "errcode": "M_FORBIDDEN",
                 "error": "You do not have a high enough power level to kick from this room."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
       tags:
         - Room membership
diff --git a/api/client-server/list_public_rooms.yaml b/api/client-server/list_public_rooms.yaml
index 334d528c3..45034488a 100644
--- a/api/client-server/list_public_rooms.yaml
+++ b/api/client-server/list_public_rooms.yaml
@@ -59,6 +59,8 @@ paths:
               "errcode": "M_NOT_FOUND",
               "error": "Room not found"
             }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
     put:
       summary: Sets the visibility of a room in the room directory
       description: |-
@@ -107,6 +109,8 @@ paths:
               "errcode": "M_NOT_FOUND",
               "error": "Room not found"
             }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
   "/publicRooms":
     get:
       summary: Lists the public rooms on the server.
diff --git a/api/client-server/login.yaml b/api/client-server/login.yaml
index e64ff953d..289b17e78 100644
--- a/api/client-server/login.yaml
+++ b/api/client-server/login.yaml
@@ -167,12 +167,16 @@ paths:
                   "errcode": "M_UNKNOWN",
                   "error": "Bad login type."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         403:
           description: |-
             The login attempt failed. For example, the password may have been incorrect.
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN"}
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/pusher.yaml b/api/client-server/pusher.yaml
index 826b69d1f..938014c60 100644
--- a/api/client-server/pusher.yaml
+++ b/api/client-server/pusher.yaml
@@ -228,7 +228,7 @@ paths:
                 "errcode": "M_MISSING_PARAM"
               }
           schema:
-            type: object
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/pushrules.yaml b/api/client-server/pushrules.yaml
index 22738c3e3..ceb9954b1 100644
--- a/api/client-server/pushrules.yaml
+++ b/api/client-server/pushrules.yaml
@@ -438,7 +438,7 @@ paths:
                 "errcode": "M_UNKNOWN"
               }
           schema:
-            type: object
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/registration.yaml b/api/client-server/registration.yaml
index 5c2059996..6ae4ddd37 100644
--- a/api/client-server/registration.yaml
+++ b/api/client-server/registration.yaml
@@ -177,6 +177,8 @@ paths:
                   "errcode": "M_USER_IN_USE",
                   "error": "Desired user ID is already taken."
               }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         401:
           description: |-
             The homeserver requires additional authentication information.
@@ -249,7 +251,7 @@ paths:
                 "error": "The specified address is already in use"
               }
           schema:
-            type: object
+            "$ref": "definitions/errors/error.yaml"
   "/account/password":
     post:
       summary: "Changes a user's password."
@@ -420,6 +422,8 @@ paths:
               "errcode": "M_USER_IN_USE",
               "error": "Desired user ID is already taken."
             }
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/third_party_membership.yaml b/api/client-server/third_party_membership.yaml
index 3050ee3a9..66c14c4d3 100644
--- a/api/client-server/third_party_membership.yaml
+++ b/api/client-server/third_party_membership.yaml
@@ -126,6 +126,8 @@ paths:
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN", "error": "@cheeky_monkey:matrix.org is banned from the room"}
+          schema:
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema:
diff --git a/api/client-server/whoami.yaml b/api/client-server/whoami.yaml
index 4d178e073..ad40eb869 100644
--- a/api/client-server/whoami.yaml
+++ b/api/client-server/whoami.yaml
@@ -65,7 +65,7 @@ paths:
               "error": "Unrecognised access token."
             }
           schema:
-            "$ref": "definitions/error.yaml"
+            "$ref": "definitions/errors/error.yaml"
         403:
           description:
             The appservice cannot masquerade as the user or has not registered them.
@@ -75,7 +75,7 @@ paths:
               "error": "Application service has not registered this user."
             }
           schema:
-            "$ref": "definitions/error.yaml"
+            "$ref": "definitions/errors/error.yaml"
         429:
           description: This request was rate-limited.
           schema: