Azure
diff --git a/‎sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java‎
Lines changed: 10 additions & 9 deletions b/‎sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java‎
Lines changed: 10 additions & 9 deletions
@@ -21,6 +21,7 @@
 import com.azure.resourcemanager.resources.fluentcore.arm.ResourceUtils;
 import com.azure.resourcemanager.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
 import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
@@ -136,19 +137,19 @@ public Mono<Void> awaitCopyStartCompletionAsync() {
                 Mono<SnapshotInner> result = Mono.just(inner);
                 if (inner.copyCompletionError() != null) { // service error
                     result = Mono.error(new ManagementException(inner.copyCompletionError().errorMessage(), null));
-                } else if (inner.completionPercent() == null || inner.completionPercent() != 100) { // in progress
+                }
+                return result;
+            })
+            .repeatWhen(longFlux -> Flux.interval(manager().serviceClient().getDefaultPollInterval()))
+            .takeUntil(inner -> {
+                if (Float.valueOf(100).equals(inner.completionPercent())) {
+                    return true;
+                } else { // in progress
                     logger.info("Wait for CopyStart complete for snapshot: {}. Complete percent: {}.",
                         inner.name(), inner.completionPercent());
-                    result = Mono.empty();
+                    return false;
                 }
-                return result;
             })
-            .repeatWhenEmpty(longFlux ->
-                longFlux
-                    .flatMap(
-                        index ->
-                            Mono.delay(ResourceManagerUtils.InternalRuntimeContext.getDelayDuration(
-                                manager().serviceClient().getDefaultPollInterval()))))
             .then();
     }