diff --git a/migration-Don-t-send-data-if-we-have-stopped.patch b/migration-Don-t-send-data-if-we-have-stopped.patch
new file mode 100644
index 0000000..08d5d3b
--- /dev/null
+++ b/migration-Don-t-send-data-if-we-have-stopped.patch
@@ -0,0 +1,31 @@
+From 855404b4766ddda851035587aa1b84768abbaf11 Mon Sep 17 00:00:00 2001
+From: Juan Quintela <quintela@redhat.com>
+Date: Wed, 22 Jan 2020 11:36:12 +0100
+Subject: [PATCH] migration: Don't send data if we have stopped
+
+If we do a cancel, we got out without one error, but we can't do the
+rest of the output as in a normal situation.
+
+Signed-off-by: Juan Quintela <quintela@redhat.com>
+Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+---
+ migration/ram.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/migration/ram.c b/migration/ram.c
+index b74929542d..dc9831d7f3 100644
+--- a/migration/ram.c
++++ b/migration/ram.c
+@@ -3686,7 +3686,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
+     ram_control_after_iterate(f, RAM_CONTROL_ROUND);
+ 
+ out:
+-    if (ret >= 0) {
++    if (ret >= 0
++        && migration_is_setup_or_active(migrate_get_current()->state)) {
+         multifd_send_sync_main(rs);
+         qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
+         qemu_fflush(f);
+-- 
+2.27.0
+