diff --git a/python/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java b/python/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java
index 97a6d16fe1d9..670c35a857bb 100644
--- a/python/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java
@@ -172,7 +172,7 @@ public class PyRedeclarationInspection extends PyInspection {
       final PsiElement element = instruction.getElement();
       if (element == null) return false;
 
-      if (element instanceof PyTryExceptStatement) return true;
+      if (element instanceof PyTryExceptStatement || element instanceof PyConditionalExpression) return true;
 
       if (element instanceof PyForStatement) {
         final PyForPart forPart = ((PyForStatement)element).getForPart();
diff --git a/python/testData/inspections/PyRedeclarationInspection/conditionalExpression.py b/python/testData/inspections/PyRedeclarationInspection/conditionalExpression.py
new file mode 100644
index 000000000000..515439986aaa
--- /dev/null
+++ b/python/testData/inspections/PyRedeclarationInspection/conditionalExpression.py
@@ -0,0 +1,3 @@
+x = 1
+res1 = None if False else x = 2
+res2 = x = 2 if True else None
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyRedeclarationInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyRedeclarationInspectionTest.java
index 4d70177033d8..c5edfc5c429a 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyRedeclarationInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyRedeclarationInspectionTest.java
@@ -160,6 +160,10 @@ public class PyRedeclarationInspectionTest extends PyInspectionTestCase {
     doTest();
   }
 
+  public void testConditionalExpression() {
+    doTest();
+  }
+
   @NotNull
   @Override
   protected Class<? extends PyInspection> getInspectionClass() {