diff --git a/Changelog.md b/Changelog.md
index 6e8d1ce9..4af09b42 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 ### Fixed
 * GODT-749 Don't force PGP/Inline when sending plaintext messages.
+* GODT-764 Fix deadlock in integration tests for Import-Export.
 
 ### Changed
 * Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8
diff --git a/test/transfer_checks_test.go b/test/transfer_checks_test.go
index 7452f8eb..8c7ea63e 100644
--- a/test/transfer_checks_test.go
+++ b/test/transfer_checks_test.go
@@ -48,7 +48,10 @@ func TransferChecksFeatureContext(s *godog.Suite) {
 func progressFinishedWith(wantResponse string) error {
 	progress := ctx.GetTransferProgress()
 	// Wait till transport is finished.
-	for range progress.GetUpdateChannel() {
+	updateCh := progress.GetUpdateChannel()
+	if updateCh != nil {
+		for range updateCh {
+		}
 	}
 
 	err := progress.GetFatalError()