diff --git a/CHANGELOG.md b/CHANGELOG.md
index a53a3aad6..4a2eb5e1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Unreleased
 
+## Bug fixes
+* Change the error message for `ErrWorkspaceStillProcessing` to be the same error message returned by the API by @uturunku1 [#864](https://github.com/hashicorp/go-tfe/pull/864)
+
 # v1.47.0
 
 ## Enhancements
diff --git a/errors.go b/errors.go
index 57fc5dccf..d096b80f4 100644
--- a/errors.go
+++ b/errors.go
@@ -66,7 +66,7 @@ var (
 	// to determine if it is safe to delete. "conflict" followed by newline is used to
 	// preserve go-tfe version compatibility with the error constructed at runtime before it was
 	// defined here.
-	ErrWorkspaceStillProcessing = errors.New("conflict\nworkspace is still being processed to discover resources")
+	ErrWorkspaceStillProcessing = errors.New("conflict\nLatest workspace state is being processed to discover resources, please try again later")
 
 	// ErrWorkspaceNotSafeToDelete is returned when a workspace has processed state and
 	// is determined to still have resources present. "conflict" followed by newline is used to