diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 985b7a06d..aba2da37b 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -5868,7 +5868,11 @@ static void valueFlowContainerForward(Token *tok, nonneg int containerId, ValueF
                 break;
         }
         if (Token::simpleMatch(tok, ") {") && Token::Match(tok->link()->previous(), "while|for|if (")) {
+            const Token * condTok = tok->link()->astOperand2();
             const Token *start = tok->next();
+            ProgramMemory pm = getProgramMemory(tok->link()->previous(), containerId, value);
+            if (conditionIsTrue(condTok, pm))
+                valueFlowContainerForward(start->next(), containerId, value, settings, cpp);
             if (isContainerSizeChanged(containerId, start, start->link()))
                 break;
             tok = start->link();
@@ -5876,6 +5880,8 @@ static void valueFlowContainerForward(Token *tok, nonneg int containerId, ValueF
                 start = tok->tokAt(2);
                 if (isContainerSizeChanged(containerId, start, start->link()))
                     break;
+                if (conditionIsFalse(condTok, pm))
+                    valueFlowContainerForward(start->next(), containerId, value, settings, cpp);
                 tok = start->link();
             }
         }