diff --git a/homeassistant/components/pi_hole/__init__.py b/homeassistant/components/pi_hole/__init__.py
index f73b7156d3e..ae51fe166c4 100644
--- a/homeassistant/components/pi_hole/__init__.py
+++ b/homeassistant/components/pi_hole/__init__.py
@@ -217,6 +217,13 @@ async def determine_api_version(
         _LOGGER.debug(
             "Connection to %s failed: %s, trying API version 5", holeV6.base_url, ex_v6
         )
+    else:
+        # It seems that occasionally the auth can succeed unexpectedly when there is a valid session
+        _LOGGER.warning(
+            "Authenticated with %s through v6 API, but succeeded with an incorrect password. This is a known bug",
+            holeV6.base_url,
+        )
+        return 6
     holeV5 = api_by_version(hass, entry, 5, password="wrong_token")
     try:
         await holeV5.get_data()
diff --git a/tests/components/pi_hole/__init__.py b/tests/components/pi_hole/__init__.py
index c20f22ac58d..c2edb51e066 100644
--- a/tests/components/pi_hole/__init__.py
+++ b/tests/components/pi_hole/__init__.py
@@ -221,12 +221,16 @@ def _create_mocked_hole(
             if wrong_host:
                 raise HoleConnectionError("Cannot authenticate with Pi-hole: err")
             password = getattr(mocked_hole, "password", None)
+
             if (
                 raise_exception
                 or incorrect_app_password
+                or api_version == 5
                 or (api_version == 6 and password not in ["newkey", "apikey"])
             ):
-                if api_version == 6:
+                if api_version == 6 and (
+                    incorrect_app_password or password not in ["newkey", "apikey"]
+                ):
                     raise HoleError("Authentication failed: Invalid password")
                 raise HoleConnectionError