diff --git a/src/Features/Core/EditAndContinue/EditSession.cs b/src/Features/Core/EditAndContinue/EditSession.cs
index daa5f6ae38515..b87642f3ac6fb 100644
--- a/src/Features/Core/EditAndContinue/EditSession.cs
+++ b/src/Features/Core/EditAndContinue/EditSession.cs
@@ -254,6 +254,12 @@ public async Task<ProjectAnalysisSummary> GetProjectAnalysisSummaryAsync(Project
             {
                 var baseProject = _baseSolution.GetProject(project.Id);
 
+                // TODO (https://github.com/dotnet/roslyn/issues/1204):
+                if (baseProject == null)
+                {
+                    return ProjectAnalysisSummary.NoChanges;
+                }
+
                 var documentAnalyses = GetChangedDocumentsAnalyses(baseProject, project);
                 if (documentAnalyses.Count == 0)
                 {