diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyReference.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyReference.java
index d50307981b36..f52164802ae1 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyReference.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyReference.java
@@ -25,7 +25,8 @@ public class IpnbPyReference extends PyReferenceImpl {
 
   @Override
   public HighlightSeverity getUnresolvedHighlightSeverity(TypeEvalContext context) {
-    return HighlightSeverity.WARNING;
+    final HighlightSeverity severity = super.getUnresolvedHighlightSeverity(context);
+    return severity != null ? HighlightSeverity.WARNING : null;
   }
 
   @NotNull
diff --git a/python/src/com/jetbrains/python/documentation/doctest/PyDocReference.java b/python/src/com/jetbrains/python/documentation/doctest/PyDocReference.java
index 35cb5a81a710..3c9e8f52c1bb 100644
--- a/python/src/com/jetbrains/python/documentation/doctest/PyDocReference.java
+++ b/python/src/com/jetbrains/python/documentation/doctest/PyDocReference.java
@@ -51,7 +51,8 @@ public class PyDocReference extends PyReferenceImpl {
 
   @Override
   public HighlightSeverity getUnresolvedHighlightSeverity(TypeEvalContext context) {
-    return HighlightSeverity.WARNING;
+    final HighlightSeverity severity = super.getUnresolvedHighlightSeverity(context);
+    return severity != null ? HighlightSeverity.WARNING : null;
   }
 
   @NotNull
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/py2TrueInDocTest.py b/python/testData/inspections/PyUnresolvedReferencesInspection/py2TrueInDocTest.py
new file mode 100644
index 000000000000..0a8a7576872b
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/py2TrueInDocTest.py
@@ -0,0 +1,5 @@
+def func(x, y):
+    """
+    >>> func(True, <warning descr="Unresolved reference 'True2'">True2</warning>)
+    """
+    return True, <error descr="Unresolved reference 'True2'">True2</error>
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
index 74f0012a62b3..04b3bc0aafbb 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
@@ -637,6 +637,11 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase {
     doMultiFileTest();
   }
 
+  // PY-24637
+  public void testPy2TrueInDocTest() {
+    doTest();
+  }
+
   @NotNull
   @Override
   protected Class<? extends PyInspection> getInspectionClass() {