diff --git a/[refs] b/[refs]
index c2cf80fbb289..8a4b80df6213 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8853dbd8c6410d1faef2785e8ee4c990b068a77
+refs/heads/master: 6ab9b1b60b1854bf5fe68ecd51cb9550c67801ec
diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c
index 58c77bbae445..507cfccc1be7 100644
--- a/trunk/drivers/block/drbd/drbd_state.c
+++ b/trunk/drivers/block/drbd/drbd_state.c
@@ -1325,7 +1325,9 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
 				"ASSERT FAILED: disk is %s during detach\n",
 				drbd_disk_str(mdev->state.disk));
 
-		drbd_send_state(mdev, ns);
+		if (ns.conn >= C_CONNECTED)
+			drbd_send_state(mdev, ns);
+
 		drbd_rs_cancel_all(mdev);
 
 		/* In case we want to get something to stable storage still,
@@ -1353,14 +1355,15 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
                 mdev->rs_failed = 0;
                 atomic_set(&mdev->rs_pending_cnt, 0);
 
-		drbd_send_state(mdev, ns);
+		if (ns.conn >= C_CONNECTED)
+			drbd_send_state(mdev, ns);
 		/* corresponding get_ldev in __drbd_set_state
 		 * this may finally trigger drbd_ldev_destroy. */
 		put_ldev(mdev);
 	}
 
 	/* Notify peer that I had a local IO error, and did not detached.. */
-	if (os.disk == D_UP_TO_DATE && ns.disk == D_INCONSISTENT)
+	if (os.disk == D_UP_TO_DATE && ns.disk == D_INCONSISTENT && ns.conn >= C_CONNECTED)
 		drbd_send_state(mdev, ns);
 
 	/* Disks got bigger while they were detached */