diff --git a/schema.graphql b/schema.graphql
index 72547250b..139d4880e 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -717,7 +717,7 @@ type Commit implements GitObject & Node & Subscribable {
   viewerCanSubscribe: Boolean!
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 
   # Returns a URL to download a zipball archive for a repository.
   # Note: For private repositories, these links are temporary and expire after five minutes.
@@ -2162,7 +2162,7 @@ type Issue implements Assignable & Closable & Comment & Labelable & Lockable & N
   viewerDidAuthor: Boolean!
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 }
 
 # Represents a comment on an Issue.
@@ -3284,7 +3284,7 @@ type Mutation {
   # Updates a pull request review comment.
   updatePullRequestReviewComment(input: UpdatePullRequestReviewCommentInput!): UpdatePullRequestReviewCommentPayload
 
-  # Updates viewers repository subscription state.
+  # Updates the state for subscribable subjects.
   updateSubscription(input: UpdateSubscriptionInput!): UpdateSubscriptionPayload
 
   # Replaces the repository's topics with the given topics.
@@ -4467,7 +4467,7 @@ type PullRequest implements Assignable & Closable & Comment & Labelable & Lockab
   viewerDidAuthor: Boolean!
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 }
 
 # Represents a Git commit part of a pull request.
@@ -5620,7 +5620,7 @@ input RemoveReactionInput {
   # A unique identifier for the client performing the mutation.
   clientMutationId: String
 
-  # The name of the emoji to react with.
+  # The name of the emoji reaction to remove.
   content: ReactionContent!
 
   # The Node ID of the subject to modify.
@@ -6244,7 +6244,7 @@ type Repository implements Node & ProjectOwner & RepositoryInfo & Starrable & Su
   viewerPermission: RepositoryPermission
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 
   # A list of users watching the repository.
   watchers(
@@ -7096,7 +7096,7 @@ interface Subscribable {
   viewerCanSubscribe: Boolean!
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 }
 
 # Represents a 'subscribed' event on a given `Subscribable`.
@@ -7120,9 +7120,6 @@ enum SubscriptionState {
   # The User is notified of all conversations.
   SUBSCRIBED
 
-  # Subscriptions are currently unavailable
-  UNAVAILABLE
-
   # The User is only notified when particpating or @mentioned.
   UNSUBSCRIBED
 }
@@ -7351,7 +7348,7 @@ type Team implements Node & Subscribable {
   viewerCanSubscribe: Boolean!
 
   # Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.
-  viewerSubscription: SubscriptionState!
+  viewerSubscription: SubscriptionState
 }
 
 # The connection type for Team.
diff --git a/schema.json b/schema.json
index 20af77e1f..d951d491f 100644
--- a/schema.json
+++ b/schema.json
@@ -5461,13 +5461,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -7951,13 +7947,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -11358,13 +11350,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -12404,13 +12392,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -12472,12 +12456,6 @@
             "description": "The User is never notified.",
             "isDeprecated": false,
             "deprecationReason": null
-          },
-          {
-            "name": "UNAVAILABLE",
-            "description": "Subscriptions are currently unavailable",
-            "isDeprecated": false,
-            "deprecationReason": null
           }
         ],
         "possibleTypes": null
@@ -13730,13 +13708,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -20320,13 +20294,9 @@
             "description": "Identifies if the viewer is watching, not watching, or ignoring the subscribable entity.",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionState",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SubscriptionState",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -36024,7 +35994,7 @@
           },
           {
             "name": "updateSubscription",
-            "description": "Updates viewers repository subscription state.",
+            "description": "Updates the state for subscribable subjects.",
             "args": [
               {
                 "name": "input",
@@ -36263,7 +36233,7 @@
           },
           {
             "name": "content",
-            "description": "The name of the emoji to react with.",
+            "description": "The name of the emoji reaction to remove.",
             "type": {
               "kind": "NON_NULL",
               "name": null,