Index: drbd/drbd_main.c
===================================================================
--- drbd/drbd_main.c	(revision 16853)
+++ drbd/drbd_main.c	(working copy)
@@ -933,7 +933,8 @@
 
 	if( ns.pdsk < Inconsistent ) {
 		/* Diskless Peer becomes primary */
-		if (os.peer == Secondary && ns.peer == Primary ) {
+		if (os.peer == Secondary && ns.peer == Primary &&
+                  mdev->bc->md.uuid[Bitmap] == 0 ) {
 			drbd_uuid_new_current(mdev);
 		}
 		/* Diskless Peer becomes secondary */