diff --git a/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs b/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs
index 930a956b085f2e83418cd6db18c4783a8db1090c..6b0e6f2ea63abaff12a521a150f2555b3722e90b 100644
--- a/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs
+++ b/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs
@@ -49,11 +49,11 @@ public async Task FindBasesAsync(Document document, int position, IFindUsagesCon
             foreach (var baseSymbol in bases)
             {
                 var sourceDefinition = await SymbolFinder.FindSourceDefinitionAsync(
-                   baseSymbol, solution, cancellationToken).ConfigureAwait(false);
-                if (sourceDefinition != null)
+                   SymbolAndProjectId.Create(baseSymbol, projectId), solution, cancellationToken).ConfigureAwait(false);
+                if (sourceDefinition.Symbol != null)
                 {
-                    var definitionItem = await sourceDefinition.ToClassifiedDefinitionItemAsync(
-                        project, includeHiddenLocations: false,
+                    var definitionItem = await sourceDefinition.Symbol.ToClassifiedDefinitionItemAsync(
+                        solution.GetProject(sourceDefinition.ProjectId), includeHiddenLocations: false,
                         FindReferencesSearchOptions.Default, cancellationToken: cancellationToken)
                         .ConfigureAwait(false);
                     await context.OnDefinitionFoundAsync(definitionItem).ConfigureAwait(false);