diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb6f00c76..7c8f0669e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -131,12 +131,26 @@ jobs:
             . venv/bin/activate
             cd docs/
             make html
-            make linkcheck
 
       - persist_to_workspace:
           root: docs/_build
           paths: html
 
+  docs-links:
+    executor: ubuntu-python37
+
+    steps:
+
+      - ubuntu_restore_all
+
+      - run:
+          name: "Check links"
+          when: always
+          command: |
+            . venv/bin/activate
+            cd docs/
+            make linkcheck
+
   static:
     executor: ubuntu-python37
 
@@ -310,6 +324,12 @@ workflows:
               only: master
             tags:
               only: /(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(\.post(0|[1-9][0-9]*))?/
+      - docs-links:  # a bit noisy, so only running on master, and does not stop deployments
+          requires:
+            - install
+          filters:
+            branches:
+              only: master
       - pypi-deploy:
           requires:
             - install
diff --git a/docs/conf.py b/docs/conf.py
index 215b4bdd7..ae51f0825 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -77,5 +77,6 @@
     "windows.html",
     "https://ieeexplore.ieee.org/*",
     "https://iohprofiler.liacs.nl/",  # server error: bad gateway
+    "https://www.facebook.com/whitehat/",  # server error: 500
     r"https://arxiv.org/abs/*",
 ]  # Transient certificate error :(