Index: drbd_receiver.c
===================================================================
--- drbd_receiver.c	(revision 2822)
+++ drbd_receiver.c	(working copy)
@@ -1890,7 +1890,7 @@
 
 	*rule_nr = 5;
 	peer = mdev->p_uuid[Bitmap] & ~((u64)1);
-	if (self == peer) return -1;
+	if (self == peer && self != ((u64)0)) return -1;
 
 	*rule_nr = 6;
 	for ( i=History_start ; i<=History_end ; i++ ) {
@@ -1901,7 +1901,7 @@
 	*rule_nr = 7;
 	self = mdev->bc->md.uuid[Bitmap] & ~((u64)1);
 	peer = mdev->p_uuid[Current] & ~((u64)1);
-	if (self == peer) return 1;
+	if (self == peer && self != ((u64)0)) return 1;
 
 	*rule_nr = 8;
 	for ( i=History_start ; i<=History_end ; i++ ) {