diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index e83865f13..8cd0184ce 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -1463,9 +1463,6 @@ static void valueFlowOppositeCondition(SymbolDatabase *symboldatabase, const Set
 
 static void valueFlowGlobalConstVar(TokenList* tokenList, const Settings *settings)
 {
-    // TODO: danmar: This is commented out until #9099 is fixed
-    return;
-
     // Get variable values...
     std::map<const Variable*, ValueFlow::Value> vars;
     for (const Token* tok = tokenList->front(); tok; tok = tok->next()) {
@@ -1474,6 +1471,8 @@ static void valueFlowGlobalConstVar(TokenList* tokenList, const Settings *settin
         // Initialization...
         if (tok == tok->variable()->nameToken() &&
             !tok->variable()->isStatic() &&
+            !tok->variable()->isVolatile() &&
+            !tok->variable()->isArgument() &&
             tok->variable()->isConst() &&
             tok->valueType() &&
             tok->valueType()->isIntegral() &&
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 9d33fef7e..55f0cc68b 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -3194,7 +3194,16 @@ private:
                "void f() {\n"
                "  a = x;\n"
                "}";
-        TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 321));
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
+
+        code = "void f(const int x = 1) {\n"
+               "    int a = x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 2U, 1));
+
+        code = "volatile const int x = 42;\n"
+               "void f(){ int a = x; }\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 2U, 42));
     }
 
     void valueFlowGlobalStaticVar() {