diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e316e7e38057e853de2e561239adf7a046a3fd87..0ef88462847547416110d574f5ec6b164254ae63 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1836,6 +1836,12 @@ def _AssembleInstanceDisks(instance, cfg, ignore_secondaries=False):
     device_info.append((instance.primary_node, inst_disk.iv_name,
                         master_result))
 
+  # leave the disks configured for the primary node
+  # this is a workaround that would be fixed better by
+  # improving the logical/physical id handling
+  for disk in instance.disks:
+    cfg.SetDiskID(disk, instance.primary_node)
+
   return disks_ok, device_info