diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index dda3e9b1e0b..1693dbb3037 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -7819,7 +7819,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
                 setValueType(tok, ValueType(sign, type, 0U));
             }
-        } else if (tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) {
+        } else if ((tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) && tok->astOperand1()) {
             if (tok->isCpp() && tok->isComparisonOp() && (getClassScope(tok->astOperand1()) || getClassScope(tok->astOperand2()))) {
                 const Function *function = getOperatorFunction(tok);
                 if (function) {
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index e981c8ea546..dcb27a39e01 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -10164,6 +10164,15 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(tok);
             TODO_ASSERT(tok->valueType() && "container(std :: string|wstring|u16string|u32string)" == tok->valueType()->str());
         }
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    int &&x = 0;\n"
+                          "}\n");
+
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "&&");
+            ASSERT(tok);
+            ASSERT_EQUALS(static_cast<const ValueType*>(nullptr), tok->valueType());
+        }
     }
 
     void valueTypeThis() {