diff --git a/attrib/utils.c b/attrib/utils.c
index 6ef89d4..77bab27 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -78,6 +78,7 @@ GIOChannel *gatt_connect(const char *src, const char *dst,
 	if (psm == 0)
 		chan = bt_io_connect(connect_cb, NULL, NULL, &tmp_err,
 				BT_IO_OPT_SOURCE_BDADDR, &sba,
+				BT_IO_OPT_SOURCE_TYPE, BDADDR_LE_PUBLIC,
 				BT_IO_OPT_DEST_BDADDR, &dba,
 				BT_IO_OPT_DEST_TYPE, dest_type,
 				BT_IO_OPT_CID, ATT_CID,
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 3610e60..e5e3030 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -1335,6 +1335,7 @@ int btd_adapter_gatt_server_start(struct btd_adapter *adapter)
 	server->le_io = bt_io_listen(connect_event, NULL,
 					&server->le_io, NULL, &gerr,
 					BT_IO_OPT_SOURCE_BDADDR, addr,
+					BT_IO_OPT_SOURCE_TYPE, BDADDR_LE_PUBLIC,
 					BT_IO_OPT_CID, ATT_CID,
 					BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
 					BT_IO_OPT_INVALID);
diff --git a/src/device.c b/src/device.c
index f4cd06b..57bfc86 100644
--- a/src/device.c
+++ b/src/device.c
@@ -3387,6 +3387,7 @@ int device_connect_le(struct btd_device *dev)
 	 */
 	io = bt_io_connect(att_connect_cb, attcb, NULL, &gerr,
 			BT_IO_OPT_SOURCE_BDADDR, adapter_get_address(adapter),
+			BT_IO_OPT_SOURCE_TYPE, BDADDR_LE_PUBLIC,
 			BT_IO_OPT_DEST_BDADDR, &dev->bdaddr,
 			BT_IO_OPT_DEST_TYPE, dev->bdaddr_type,
 			BT_IO_OPT_CID, ATT_CID,