diff --git a/language-server/src/features/hover.js b/language-server/src/features/hover.js
index 4ab89c5..fed0109 100644
--- a/language-server/src/features/hover.js
+++ b/language-server/src/features/hover.js
@@ -17,16 +17,19 @@ export default {
       // This is a little wierd because we want the hover to be on the keyword, but
       // the annotation is actually on the value not the keyword.
       if (keyword.parent && SchemaNode.typeOf(keyword.parent) === "property" && keyword.parent.children[0] === keyword) {
-        return {
-          contents: {
-            kind: MarkupKind.Markdown,
-            value: SchemaNode.annotation(keyword.parent.children[1], "description", annotationDialectUri).join("\n")
-          },
-          range: {
-            start: document.positionAt(keyword.offset),
-            end: document.positionAt(keyword.offset + keyword.textLength)
-          }
-        };
+        const description = SchemaNode.annotation(keyword.parent.children[1], "description", annotationDialectUri);
+        if (description.length > 0) {
+          return {
+            contents: {
+              kind: MarkupKind.Markdown,
+              value: description.join("\n")
+            },
+            range: {
+              start: document.positionAt(keyword.offset),
+              end: document.positionAt(keyword.offset + keyword.textLength - 1)
+            }
+          };
+        }
       }
     });
   },
diff --git a/language-server/src/features/hover.test.js b/language-server/src/features/hover.test.js
new file mode 100644
index 0000000..e4c7b7a
--- /dev/null
+++ b/language-server/src/features/hover.test.js
@@ -0,0 +1,697 @@
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { HoverRequest, MarkupKind } from "vscode-languageserver";
+import hover from "./hover.js";
+import { closeDocument, getTestClient, initializeServer, openDocument } from "../test-utils.js";
+
+
+describe("Feature - Hover", () => {
+  let client;
+  let capabilities;
+
+  beforeAll(async () => {
+    client = getTestClient([hover]);
+    capabilities = await initializeServer(client);
+  });
+
+  test("capabilities", () => {
+    expect(capabilities.hoverProvider).to.equal(true);
+  });
+
+  describe("match response", () => {
+    let response;
+    let documentUri;
+
+    beforeAll(async () => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 1,
+          character: 3
+        }
+      };
+      response = await client.sendRequest(HoverRequest, params);
+    });
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test("kind", async () => {
+      expect(response.contents.kind).to.eql(MarkupKind.Markdown);
+    });
+
+    test("range", () => {
+      expect(response.range).to.eql({
+        start: { line: 1, character: 2 },
+        end: { line: 1, character: 10 }
+      });
+    });
+  });
+
+  describe("hover on keyword value", () => {
+    let response;
+    let documentUri;
+
+    beforeAll(async () => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "Foo"
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 12
+        }
+      };
+      response = await client.sendRequest(HoverRequest, params);
+    });
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test("should not have a message", () => {
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("hover on a key with a keyword name, but not in a schema", () => {
+    let response;
+    let documentUri;
+
+    beforeAll(async () => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "properties": {
+    "title": {}
+  }
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 3,
+          character: 6
+        }
+      };
+      response = await client.sendRequest(HoverRequest, params);
+    });
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test("should not have a message", () => {
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("2020-12", () => {
+    let documentUri;
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test.each([
+      // Applicators
+      ["prefixItems", "[{}]"],
+      ["items", "{}"],
+      ["contains", "{}"],
+      ["additionalProperties", "{}"],
+      ["properties", "{}"],
+      ["patternProperties", "{}"],
+      ["dependentSchemas", "{}"],
+      ["propertyNames", "{}"],
+      ["if", "{}"],
+      ["then", "{}"],
+      ["else", "{}"],
+      ["allOf", "[{}]"],
+      ["anyOf", "[{}]"],
+      ["oneOf", "[{}]"],
+      ["not", "{}"],
+
+      // Content
+      ["contentMediaType", "\"\""],
+      ["contentEncoding", "\"\""],
+      ["contentSchema", "{}"],
+
+      // Core
+      ["$id", "\"\""],
+      ["$anchor", "\"foo\""],
+      ["$ref", "\"\""],
+      ["$dynamicRef", "\"\""],
+      ["$dynamicAnchor", "\"foo\""],
+      ["$vocabulary", "{}"],
+      ["$comment", "\"\""],
+      ["$defs", "{}"],
+
+      // Format
+      ["format", "\"\""],
+
+      // Meta-data
+      ["title", "\"\""],
+      ["description", "\"\""],
+      ["default", "true"],
+      ["deprecated", "false"],
+      ["readOnly", "true"],
+      ["writeOnly", "false"],
+      ["examples", "[]"],
+
+      // Unevaluated
+      ["unevaluatedItems", "true"],
+      ["unevaluatedProperties", "true"],
+
+      // Validation
+      ["multipleOf", "1"],
+      ["maximum", "42"],
+      ["exclusiveMaximum", "42"],
+      ["minimum", "42"],
+      ["exclusiveMinimum", "42"],
+      ["maxLength", "42"],
+      ["minLength", "42"],
+      ["pattern", "\"\""],
+      ["maxItems", "42"],
+      ["minItems", "42"],
+      ["uniqueItems", "false"],
+      ["maxContains", "1"],
+      ["minContains", "1"],
+      ["maxProperties", "1"],
+      ["minProperties", "1"],
+      ["required", "[]"],
+      ["dependentRequired", "{}"],
+      ["const", "true"],
+      ["enum", "[]"],
+      ["type", "\"object\""]
+    ])("%s should have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response?.contents.value).to.not.be.empty;
+    });
+
+    test.each([
+      // Applicators
+      ["additionalItems", "true"],
+      ["dependencies", "{}"],
+
+      // Core
+      ["id", "\"\""],
+      ["$recursiveRef", "\"#\""],
+      ["$recursiveAnchor", "true"],
+      ["definitions", "{}"]
+    ])("%s should not have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("2019-09", () => {
+    let documentUri;
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test.each([
+      // Applicators
+      ["additionalItems", "true"],
+      ["unevaluatedItems", "true"],
+      ["items", "true"],
+      ["contains", "true"],
+      ["additionalProperties", "true"],
+      ["unevaluatedProperties", "true"],
+      ["properties", "{}"],
+      ["patternProperties", "{}"],
+      ["dependentSchemas", "{}"],
+      ["propertyNames", "{}"],
+      ["if", "true"],
+      ["then", "true"],
+      ["else", "true"],
+      ["allOf", "[{}]"],
+      ["anyOf", "[{}]"],
+      ["oneOf", "[{}]"],
+      ["not", "{}"],
+
+      // Content
+      ["contentMediaType", "\"\""],
+      ["contentEncoding", "\"\""],
+      ["contentSchema", "{}"],
+
+      // Core
+      ["$id", "\"\""],
+      ["$anchor", "\"foo\""],
+      ["$ref", "\"\""],
+      ["$recursiveRef", "\"\""],
+      ["$recursiveAnchor", "true"],
+      ["$vocabulary", "{}"],
+      ["$comment", "\"\""],
+      ["$defs", "{}"],
+
+      // Format
+      ["format", "\"\""],
+
+      // Meta-data
+      ["title", "\"\""],
+      ["description", "\"\""],
+      ["default", "\"\""],
+      ["deprecated", "true"],
+      ["readOnly", "true"],
+      ["writeOnly", "true"],
+      ["examples", "[]"],
+
+      // Validation
+      ["multipleOf", "1"],
+      ["maximum", "1"],
+      ["exclusiveMaximum", "1"],
+      ["minimum", "1"],
+      ["exclusiveMinimum", "1"],
+      ["maxLength", "1"],
+      ["minLength", "1"],
+      ["pattern", "\"\""],
+      ["maxItems", "1"],
+      ["minItems", "1"],
+      ["uniqueItems", "true"],
+      ["maxContains", "1"],
+      ["minContains", "1"],
+      ["maxProperties", "1"],
+      ["minProperties", "1"],
+      ["required", "[]"],
+      ["dependentRequired", "{}"],
+      ["const", "1"],
+      ["enum", "[]"],
+      ["type", "\"object\""]
+    ])("%s should have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response?.contents.value).to.not.be.empty;
+    });
+
+    test.each([
+      // Applicators
+      ["dependencies", "{}"],
+      ["prefixItems", "[{}]"],
+
+      // Core
+      ["id", "\"\""],
+      ["$dynamicRef", "\"#foo\""],
+      ["$dynamicAnchor", "\"foo\""],
+      ["definitions", "{}"]
+    ])("%s should not have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("draft-07", () => {
+    let documentUri;
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test.each([
+      ["$id", "\"\""],
+      ["$ref", "\"\""],
+      ["$comment", "\"\""],
+      ["title", "\"\""],
+      ["description", "\"\""],
+      ["default", "\"\""],
+      ["readOnly", "true"],
+      ["writeOnly", "true"],
+      ["examples", "[]"],
+      ["multipleOf", "1"],
+      ["maximum", "1"],
+      ["exclusiveMaximum", "1"],
+      ["minimum", "1"],
+      ["exclusiveMinimum", "1"],
+      ["maxLength", "1"],
+      ["minLength", "1"],
+      ["pattern", "\"\""],
+      ["additionalItems", "true"],
+      ["items", "true"],
+      ["maxItems", "1"],
+      ["minItems", "1"],
+      ["uniqueItems", "true"],
+      ["contains", "{}"],
+      ["maxProperties", "1"],
+      ["minProperties", "1"],
+      ["required", "[\"foo\"]"],
+      ["additionalProperties", "true"],
+      ["definitions", "{}"],
+      ["properties", "{}"],
+      ["patternProperties", "{}"],
+      ["dependencies", "{}"],
+      ["propertyNames", "{}"],
+      ["const", "1"],
+      ["enum", "[1]"],
+      ["type", "\"object\""],
+      ["format", "\"\""],
+      ["contentMediaType", "\"\""],
+      ["contentEncoding", "\"\""],
+      ["if", "true"],
+      ["then", "true"],
+      ["else", "true"],
+      ["allOf", "[{}]"],
+      ["anyOf", "[{}]"],
+      ["oneOf", "[{}]"],
+      ["not", "{}"]
+    ])("%s should have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response?.contents.value).to.not.be.empty;
+    });
+
+    test.each([
+      ["dependentSchemas", "{}"],
+      ["dependentRequired", "{}"],
+      ["prefixItems", "[{}]"],
+      ["minContains", "1"],
+      ["maxContains", "1"],
+      ["id", "\"\""],
+      ["$dynamicRef", "\"#foo\""],
+      ["$dynamicAnchor", "\"foo\""],
+      ["$recursiveRef", "\"#\""],
+      ["$recursiveAnchor", "true"],
+      ["unevaluatedProperties", "true"],
+      ["unevaluatedItems", "true"],
+      ["$defs", "{}"]
+    ])("%s should not have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("draft-06", () => {
+    let documentUri;
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test.each([
+      ["$id", "\"\""],
+      ["$ref", "\"\""],
+      ["title", "\"\""],
+      ["description", "\"\""],
+      ["default", "\"\""],
+      ["examples", "[]"],
+      ["multipleOf", "1"],
+      ["maximum", "1"],
+      ["exclusiveMaximum", "1"],
+      ["minimum", "1"],
+      ["exclusiveMinimum", "1"],
+      ["maxLength", "1"],
+      ["minLength", "1"],
+      ["pattern", "\"\""],
+      ["additionalItems", "true"],
+      ["items", "true"],
+      ["maxItems", "1"],
+      ["minItems", "1"],
+      ["uniqueItems", "true"],
+      ["contains", "{}"],
+      ["maxProperties", "1"],
+      ["minProperties", "1"],
+      ["required", "[\"foo\"]"],
+      ["additionalProperties", "{}"],
+      ["definitions", "{}"],
+      ["properties", "{}"],
+      ["patternProperties", "{}"],
+      ["dependencies", "{}"],
+      ["propertyNames", "{}"],
+      ["const", "1"],
+      ["enum", "[1]"],
+      ["type", "\"object\""],
+      ["format", "\"\""],
+      ["allOf", "[{}]"],
+      ["anyOf", "[{}]"],
+      ["oneOf", "[{}]"],
+      ["not", "{}"]
+    ])("%s should have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response?.contents.value).to.not.be.empty;
+    });
+
+    test.each([
+      ["dependentSchemas", "{}"],
+      ["dependentRequired", "{}"],
+      ["prefixItems", "[{}]"],
+      ["if", "{}"],
+      ["then", "{}"],
+      ["else", "{}"],
+      ["minContains", "1"],
+      ["maxContains", "1"],
+      ["id", "\"\""],
+      ["$dynamicRef", "\"#foo\""],
+      ["$dynamicAnchor", "\"foo\""],
+      ["$recursiveRef", "\"#\""],
+      ["$recursiveAnchor", "true"],
+      ["unevaluatedProperties", "true"],
+      ["unevaluatedItems", "true"],
+      ["$defs", "{}"]
+    ])("%s should not have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response).to.equal(null);
+    });
+  });
+
+  describe("draft-04", () => {
+    let documentUri;
+
+    afterAll(async () => {
+      await closeDocument(client, documentUri);
+    });
+
+    test.each([
+      ["id", "\"\""],
+      ["title", "\"\""],
+      ["description", "\"\""],
+      ["default", "\"\""],
+      ["multipleOf", "1"],
+      ["maximum", "1"],
+      ["exclusiveMaximum", "true, \"maximum\": 1"],
+      ["minimum", "1"],
+      ["exclusiveMinimum", "true, \"minimum\": 1"],
+      ["maxLength", "1"],
+      ["minLength", "1"],
+      ["pattern", "\"\""],
+      ["additionalItems", "{}"],
+      ["items", "{}"],
+      ["maxItems", "1"],
+      ["minItems", "1"],
+      ["uniqueItems", "true"],
+      ["maxProperties", "1"],
+      ["minProperties", "1"],
+      ["required", "[\"foo\"]"],
+      ["additionalProperties", "{}"],
+      ["definitions", "{}"],
+      ["properties", "{}"],
+      ["patternProperties", "{}"],
+      ["dependencies", "{}"],
+      ["enum", "[1]"],
+      ["type", "\"object\""],
+      ["format", "\"\""],
+      ["allOf", "[{}]"],
+      ["anyOf", "[{}]"],
+      ["oneOf", "[{}]"],
+      ["not", "{}"]
+    ])("%s should have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response?.contents.value).to.not.be.empty;
+    });
+
+    test.each([
+      ["dependentSchemas", "{}"],
+      ["dependentRequired", "{}"],
+      ["prefixItems", "[{}]"],
+      ["if", "{}"],
+      ["then", "{}"],
+      ["else", "{}"],
+      ["contains", "{}"],
+      ["minContains", "1"],
+      ["maxContains", "1"],
+      ["$id", "\"\""],
+      ["$dynamicRef", "\"#foo\""],
+      ["$dynamicAnchor", "\"foo\""],
+      ["$recursiveRef", "\"#\""],
+      ["$recursiveAnchor", "true"],
+      ["unevaluatedProperties", "true"],
+      ["unevaluatedItems", "true"],
+      ["$defs", "{}"]
+    ])("%s should not have a message", async (keyword, value) => {
+      documentUri = await openDocument(client, "./subject.schema.json", `{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "${keyword}": ${value}
+}`);
+
+      /**
+       * @type {import("vscode-languageserver").HoverParams}
+       */
+      const params = {
+        textDocument: { uri: documentUri },
+        position: {
+          line: 2,
+          character: 2
+        }
+      };
+      const response = await client.sendRequest(HoverRequest, params);
+
+      expect(response).to.equal(null);
+    });
+  });
+});
diff --git a/package-lock.json b/package-lock.json
index a5f6776..ace9b01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -578,7 +578,8 @@
     },
     "node_modules/@hyperjump/json-schema": {
       "version": "1.9.3",
-      "resolved": "git+ssh://git@github.com/hyperjump-io/json-schema.git#c6ae4a964c586ac4dd1ea256dc60b6ce6f107833",
+      "resolved": "git+ssh://git@github.com/hyperjump-io/json-schema.git#09ecac18041a58320c1c54187351d9b87d2ab1ca",
+      "license": "MIT",
       "dependencies": {
         "@hyperjump/json-pointer": "^1.1.0",
         "@hyperjump/pact": "^1.2.0",