diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
index c7033c533..7a3079394 100644
--- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
+++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
@@ -542,7 +542,7 @@ public function prepare_upload( $post, $push_sync = false ) {
 			$suffix_data     = wp_parse_args( $suffix_meta, $suffix_defaults );
 
 			// Prepare a uniqueness check and get a suffix if needed.
-			if ( true === $push_sync && true !== $downsync ) {
+			if ( true === $push_sync && true !== $downsync && empty( get_post_meta( $post->ID, Sync::META_KEYS['downloading'], true ) ) ) {
 				if ( $public_id !== $suffix_data['public_id'] || empty( $suffix_data['suffix'] ) ) {
 					$suffix_data['suffix'] = $this->sync->add_suffix_maybe( $public_id, $post->ID );
 					if ( ! empty( $suffix_data['suffix'] ) ) {