diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98382a5175..0c37be3155 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [[#2057]]: Make begin,commit,rollback cancel-safe in sqlite  [[@madadam]]
 * [[#2058]]: fix typo in documentation [[@lovasoa]]
 * [[#2067]]: fix(docs): close code block in query_builder.rs [[@abonander]]
-* [[#2069]]: Fix `prepare` race condition in workspaces [[@cycraig]]
+* [[#2069]]: Fix `prepare` race condition in workspaces [[@cycraig]]\
+    * NOTE: this changes the directory structure under `target/` that `cargo sqlx prepare` depends on.
+      If you use offline mode in your workflow, please rerun `cargo install sqlx-cli` to upgrade.
 * [[#2072]]: SqliteConnectOptions typo [[@fasterthanlime]]
 * [[#2074]]: fix: mssql uses unsigned for tinyint instead of signed [[@he4d]]
 * [[#2081]]: close unnamed portal after each executed extended query [[@DXist]]
diff --git a/sqlx-postgres/src/copy.rs b/sqlx-postgres/src/copy.rs
index 46bb5fe658..620784308a 100644
--- a/sqlx-postgres/src/copy.rs
+++ b/sqlx-postgres/src/copy.rs
@@ -145,10 +145,13 @@ impl<C: DerefMut<Target = PgConnection>> PgCopyIn<C> {
         conn.wait_until_ready().await?;
         conn.stream.send(Query(statement)).await?;
 
-        let response: CopyResponse = conn
-            .stream
-            .recv_expect(MessageFormat::CopyInResponse)
-            .await?;
+        let response = match conn.stream.recv_expect(MessageFormat::CopyInResponse).await {
+            Ok(res) => res,
+            Err(e) => {
+                conn.stream.recv().await?;
+                return Err(e);
+            }
+        };
 
         Ok(PgCopyIn {
             conn: Some(conn),
@@ -299,10 +302,17 @@ impl<C: DerefMut<Target = PgConnection>> PgCopyIn<C> {
             .expect("CopyWriter::finish: conn taken illegally");
 
         conn.stream.send(CopyDone).await?;
-        let cc: CommandComplete = conn
+        let cc: CommandComplete = match conn
             .stream
             .recv_expect(MessageFormat::CommandComplete)
-            .await?;
+            .await
+        {
+            Ok(cc) => cc,
+            Err(e) => {
+                conn.stream.recv().await?;
+                return Err(e);
+            }
+        };
 
         conn.stream
             .recv_expect(MessageFormat::ReadyForQuery)