diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22188a2a4..babe03943 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ CHANGELOG
 - Do not crash when renaming a stack that has never been updated, when using the local backend. (fixes 
   [#2654](https://github.com/pulumi/pulumi/issues/2654))
 
+- Fix intermittet "NoSuchKey" issues when using the S3 based backend. (fixes [#2714](https://github.com/pulumi/pulumi/issues/2714)).
+
 ## 1.0.0-beta.2 (2019-08-13)
 
 - Fix the package version compatibility checks in the NodeJS language host.
diff --git a/pkg/backend/filestate/snapshot.go b/pkg/backend/filestate/snapshot.go
index 249cc5e13..e8e3a27a4 100644
--- a/pkg/backend/filestate/snapshot.go
+++ b/pkg/backend/filestate/snapshot.go
@@ -15,8 +15,6 @@
 package filestate
 
 import (
-	"os"
-
 	"github.com/pulumi/pulumi/pkg/resource/deploy"
 	"github.com/pulumi/pulumi/pkg/secrets"
 	"github.com/pulumi/pulumi/pkg/tokens"
@@ -35,12 +33,7 @@ func (sp *localSnapshotPersister) SecretsManager() secrets.Manager {
 }
 
 func (sp *localSnapshotPersister) Save(snapshot *deploy.Snapshot) error {
-	_, _, err := sp.backend.getStack(sp.name)
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	_, err = sp.backend.saveStack(sp.name, snapshot, sp.sm)
+	_, err := sp.backend.saveStack(sp.name, snapshot, sp.sm)
 	return err
 
 }