diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSources.qll b/java/ql/src/semmle/code/java/dataflow/FlowSources.qll
index 6e9810c85e8..0f00208df91 100644
--- a/java/ql/src/semmle/code/java/dataflow/FlowSources.qll
+++ b/java/ql/src/semmle/code/java/dataflow/FlowSources.qll
@@ -298,7 +298,10 @@ private class AndroidIntentExtraSource extends RemoteFlowSource {
   AndroidIntentExtraSource() {
     exists(MethodAccess ma |
       ma instanceof IntentGetExtraMethodAccess and
-      this.asExpr().(VarAccess).getVariable().getAnAssignedValue() = ma
+      (
+        this.asExpr().(VarAccess).getVariable().getAnAssignedValue() = ma or
+        ma.getQualifier() = this.asExpr()
+      )
     )
   }