diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index a1ae9e133f..010aabb57f 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -251,6 +251,9 @@ namespace ts {
             state.seenAffectedFiles = createMap<true>();
         }
 
+        state.emittedBuildInfo = !state.changedFilesSet.size &&
+            !state.affectedFilesPendingEmit;
+
         return state;
     }
 
diff --git a/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js b/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js
index fae2a9ef15..2b0a9fc879 100644
--- a/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js
+++ b/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js
@@ -3,4 +3,3 @@
 exitCode:: 0
 
 
-//// [/src/project/.tsbuildinfo] file written with same contents