diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
index 61b5c40e6e5..75a35c2a5f0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -49,7 +49,10 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
             }
 
-            WriteLocationsToTrap(trapFile.field_location, this, Locations);
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.field_location, this, Locations);
+            }
 
             if (!IsSourceDeclaration || !Symbol.FromSource())
                 return;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
index a5d208fc86f..8b099261a10 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
@@ -115,9 +115,10 @@ namespace Semmle.Extraction.CSharp.Entities
             var type = Type.Create(Context, Symbol.Type);
             trapFile.@params(this, Name, type.TypeRef, Ordinal, ParamKind, Parent!, Original);
 
-            foreach (var l in Symbol.Locations)
+            if (Context.ExtractLocation(Symbol))
             {
-                WriteLocationToTrap(trapFile.param_location, this, Context.CreateLocation(l));
+                var locations = Context.GetLocations(Symbol);
+                WriteLocationsToTrap(trapFile.param_location, this, locations);
             }
 
             if (!Symbol.Locations.Any() &&
diff --git a/csharp/ql/lib/semmle/code/csharp/Variable.qll b/csharp/ql/lib/semmle/code/csharp/Variable.qll
index 02018c260a6..746ea6acd2f 100644
--- a/csharp/ql/lib/semmle/code/csharp/Variable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Variable.qll
@@ -213,7 +213,7 @@ class Parameter extends LocalScopeVariable, Attributable, TopLevelExprParent, @p
     params(this, _, getTypeRef(result), _, _, _, _)
   }
 
-  override Location getALocation() { param_location(this, result) }
+  override Location getALocation() { param_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = this.getName() }
 
@@ -449,7 +449,7 @@ class Field extends Variable, AssignableMember, Attributable, TopLevelExprParent
     fields(this, _, _, _, getTypeRef(result), _)
   }
 
-  override Location getALocation() { field_location(this, result) }
+  override Location getALocation() { field_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = Variable.super.toString() }