diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 861930288..33e1055af 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -2990,6 +2990,8 @@ static const Token* solveExprValues(const Token* expr, std::list<ValueFlow::Valu
             return solveExprValues(binaryTok, values);
         }
         case '*': {
+            if (intval == 0)
+                break;
             transformIntValues(values, [&](MathLib::bigint x) {
                 return x / intval;
             });
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index fb36816a7..27a3e0a6b 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -130,6 +130,8 @@ private:
         TEST_CASE(valueFlowPointerAliasDeref);
 
         TEST_CASE(valueFlowCrashIncompleteCode);
+
+        TEST_CASE(valueFlowCrash);
     }
 
     static bool isNotTokValue(const ValueFlow::Value &val) {
@@ -4343,6 +4345,15 @@ private:
                "}\n";
         valueOfTok(code, "0");
     }
+
+    void valueFlowCrash() {
+        const char* code;
+
+        code = "void f(int x) {\n"
+               "    if (0 * (x > 2)) {}\n"
+               "}\n";
+        valueOfTok(code, "x");
+    }
 };
 
 REGISTER_TEST(TestValueFlow)