diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index bb4bcb544e5..c2042456f18 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -7,6 +7,7 @@ build:
 
 sphinx:
   configuration: docs/source/conf.py
+  fail_on_warning: true
 
 python:
   install:
diff --git a/docs/Makefile b/docs/Makefile
index 53ad878881e..bc483404063 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -j4
+SPHINXOPTS    = -j4 -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build