diff --git a/docs/api/ipykernel.comm.rst b/docs/api/ipykernel.comm.rst
index 1cf9ee4e7..a2d529ed0 100644
--- a/docs/api/ipykernel.comm.rst
+++ b/docs/api/ipykernel.comm.rst
@@ -7,19 +7,19 @@ Submodules
 
 .. automodule:: ipykernel.comm.comm
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.comm.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 Module contents
 ---------------
 
 .. automodule:: ipykernel.comm
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
diff --git a/docs/api/ipykernel.inprocess.rst b/docs/api/ipykernel.inprocess.rst
index c2d6536bc..24d62e7ad 100644
--- a/docs/api/ipykernel.inprocess.rst
+++ b/docs/api/ipykernel.inprocess.rst
@@ -7,49 +7,49 @@ Submodules
 
 .. automodule:: ipykernel.inprocess.blocking
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.channels
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.client
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.constants
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.ipkernel
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.inprocess.socket
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 Module contents
 ---------------
 
 .. automodule:: ipykernel.inprocess
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
diff --git a/docs/api/ipykernel.rst b/docs/api/ipykernel.rst
index 0f023070d..85d1f2db3 100644
--- a/docs/api/ipykernel.rst
+++ b/docs/api/ipykernel.rst
@@ -16,145 +16,145 @@ Submodules
 
 .. automodule:: ipykernel.compiler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.connect
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.control
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.debugger
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.displayhook
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.embed
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.eventloops
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.heartbeat
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.iostream
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.ipkernel
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.jsonutil
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.kernelapp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.kernelbase
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.kernelspec
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.log
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.parentpoller
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.shellchannel
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.socket_pair
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.subshell
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.subshell_manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.thread
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.trio_runner
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 
 .. automodule:: ipykernel.zmqshell
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 Module contents
 ---------------
 
 .. automodule:: ipykernel
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
diff --git a/docs/conf.py b/docs/conf.py
index 5a5f8ed5c..7ab188f4b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -124,6 +124,12 @@
 # If true, keep warnings as "system message" paragraphs in the built documents.
 # keep_warnings = False
 
+suppress_warnings = [
+    # Remove both once fix for https://github.com/ipython/ipython/issues/15202 is released
+    "sphinx_autodoc_typehints.forward_reference",
+    "sphinx_autodoc_typehints.guarded_import",
+]
+
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 
diff --git a/pyproject.toml b/pyproject.toml
index 7552b738e..252a684ea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,9 +43,7 @@ Tracker = "https://github.com/ipython/ipykernel/issues"
 
 [project.optional-dependencies]
 docs = [
-  # Sphinx pinned until `sphinx-autodoc-typehints` issue is resolved:
-  # https://github.com/tox-dev/sphinx-autodoc-typehints/issues/523
-  "sphinx<8.2.0",
+  "sphinx",
   "myst_parser",
   "pydata_sphinx_theme",
   "sphinxcontrib_github_alt",