diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
index be7d04329..a33f2208f 100644
--- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
+++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
@@ -109,7 +109,7 @@ public function is_synced( $post_id ) {
 			return true;
 		}
 
-		if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) ) {
+		if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) {
 			update_post_meta( $post_id, Sync::META_KEYS['syncing'], true );
 		}
 
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php
index 9fc1a6315..0733bf599 100644
--- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php
+++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php
@@ -165,6 +165,7 @@ function ( $val ) use ( $media ) {
 
 		// Flag the download
 		update_post_meta( $attachment_id, Sync::META_KEYS['downloading'], true );
+		delete_post_meta( $attachment_id, Sync::META_KEYS['syncing'] );
 
 		if ( ! defined( 'DOING_BULK_SYNC' ) ) {
 			$this->sync->managers['upload']->add_to_sync( $attachment_id ); // Auto sync if upgrading outside of bulk sync.