diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index cdeccaced6..750b273baa 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -1857,7 +1857,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data)
 
     if (data->timeout && virTimeMillisNow(&start) < 0) {
         vshSaveLibvirtError();
-        return -1;
+        goto cleanup;
     }
 
     last.cur = last.end = 0;