diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 2330a149e114008dacac61bf58d82f879528735b..fc20c719406c8e0f7c0bc538be131a9318d4e6f2 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -40,7 +40,9 @@
  */
 
 /* All supported qemu migration flags.  */
-#define QEMU_MIGRATION_BASE_FLAGS \
+
+#ifdef WITH_HAM_MIGRATE
+#define QEMU_MIGRATION_FLAGS \
     (VIR_MIGRATE_LIVE | \
      VIR_MIGRATE_PEER2PEER | \
      VIR_MIGRATE_TUNNELLED | \
@@ -63,13 +65,35 @@
      VIR_MIGRATE_POSTCOPY_RESUME | \
      VIR_MIGRATE_ZEROCOPY | \
      VIR_MIGRATE_RETURNPATH | \
-     VIR_MIGRATE_ONECOPY | \
+     VIR_MIGRATE_ONECOPY |   \
+     VIR_MIGRATE_LDST | \
      0)
-
-#ifdef WITH_HAM_MIGRATE
-#define QEMU_MIGRATION_FLAGS (QEMU_MIGRATION_BASE_FLAGS | VIR_MIGRATE_LDST)
 #else
-#define QEMU_MIGRATION_FLAGS QEMU_MIGRATION_BASE_FLAGS
+#define QEMU_MIGRATION_FLAGS \
+    (VIR_MIGRATE_LIVE | \
+     VIR_MIGRATE_PEER2PEER | \
+     VIR_MIGRATE_TUNNELLED | \
+     VIR_MIGRATE_PERSIST_DEST | \
+     VIR_MIGRATE_UNDEFINE_SOURCE | \
+     VIR_MIGRATE_PAUSED | \
+     VIR_MIGRATE_NON_SHARED_DISK | \
+     VIR_MIGRATE_NON_SHARED_INC | \
+     VIR_MIGRATE_CHANGE_PROTECTION | \
+     VIR_MIGRATE_UNSAFE | \
+     VIR_MIGRATE_OFFLINE | \
+     VIR_MIGRATE_COMPRESSED | \
+     VIR_MIGRATE_ABORT_ON_ERROR | \
+     VIR_MIGRATE_AUTO_CONVERGE | \
+     VIR_MIGRATE_RDMA_PIN_ALL | \
+     VIR_MIGRATE_POSTCOPY | \
+     VIR_MIGRATE_TLS | \
+     VIR_MIGRATE_PARALLEL | \
+     VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES | \
+     VIR_MIGRATE_POSTCOPY_RESUME | \
+     VIR_MIGRATE_ZEROCOPY | \
+     VIR_MIGRATE_RETURNPATH | \
+     VIR_MIGRATE_ONECOPY | \
+     0)
 #endif
 
 /* All supported migration parameters and their types. */
diff --git a/src/util/virham.c b/src/util/virham.c
index 6a132738de2041517f03cb552ec0e1831320f03a..2d8298e6bf54b79a526aa9a7e62d132bf5f59057 100644
--- a/src/util/virham.c
+++ b/src/util/virham.c
@@ -211,6 +211,11 @@ virHamRackIpcAsyncSendAndRecv(const char *req)
 void
 virHamClearAll(const char *hostname)
 {
+    if (!virFileExists(VIR_HAM_RACK_IPC_PATH)) {
+        VIR_WARN("Ham rack ipc file doesn't exist");
+        return;
+    }
+
     g_autofree char *req = NULL;
 
     if (!(req = virHamGetClearReqInit(VIR_HAM_CLEAR_ALL, hostname))) {