diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 168ce6a1e5c..3353866e334 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -85,12 +85,12 @@ private module GuardsInput implements SharedGuards::InputSig<Location, ControlFl
 
     predicate matchEdge(BasicBlock bb1, BasicBlock bb2) {
       bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = true)) = bb2 and
-      bb1.getLastNode() = AstNode.super.getControlFlowNode()
+      bb1.getLastNode() = super.getPattern().getControlFlowNode()
     }
 
     predicate nonMatchEdge(BasicBlock bb1, BasicBlock bb2) {
       bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = false)) = bb2 and
-      bb1.getLastNode() = AstNode.super.getControlFlowNode()
+      bb1.getLastNode() = super.getPattern().getControlFlowNode()
     }
   }
 
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
index 23088bd2f80..56dc9aa55e5 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Guards.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -168,14 +168,20 @@ private module GuardsInput implements SharedGuards::InputSig<Location, ControlFl
       )
     }
 
+    private ControlFlowNode getPatternNode() {
+      result = this.(J::PatternCase).getUniquePattern().getControlFlowNode()
+      or
+      result = unique(Expr e | this.(J::ConstCase).getValue(_) = e).getControlFlowNode()
+    }
+
     predicate matchEdge(BasicBlock bb1, BasicBlock bb2) {
       bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = true)) = bb2 and
-      bb1.getLastNode() = super.getControlFlowNode()
+      bb1.getLastNode() = this.getPatternNode()
     }
 
     predicate nonMatchEdge(BasicBlock bb1, BasicBlock bb2) {
       bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = false)) = bb2 and
-      bb1.getLastNode() = super.getControlFlowNode()
+      bb1.getLastNode() = this.getPatternNode()
     }
   }