diff --git a/src/device.c b/src/device.c
index 38e2321..4f1af70 100644
--- a/src/device.c
+++ b/src/device.c
@@ -4987,7 +4987,9 @@
 	}
 
 	dev->att_mtu = MIN(mtu, BT_ATT_MAX_LE_MTU);
-	attrib = g_attrib_new(io, BT_ATT_DEFAULT_LE_MTU, false);
+	attrib = g_attrib_new(io,
+			cid == ATT_CID ? BT_ATT_DEFAULT_LE_MTU : dev->att_mtu,
+			false);
 	if (!attrib) {
 		error("Unable to create new GAttrib instance");
 		return false;