diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 71d606d8b..5584002aa 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -1200,6 +1200,10 @@ void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string
 
 void CheckUninitVar::valueFlowUninit()
 {
+    // FIXME: #8036, #8041
+    if (!_settings->experimental)
+        return;
+
     const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
     std::list<Scope>::const_iterator scope;