diff --git a/android/adapter.c b/android/adapter.c
index 9f1e458..929e8cb 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -1487,16 +1487,9 @@ void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
 
 	switch (opcode) {
 	case HAL_OP_ENABLE:
-		/*
-		 * In case the controller has connectable and discoverable
-		 * enabled, make sure to disable it first.
-		 *
-		 * It is enough to just clear the connectable setting since
-		 * at the same time it will automatically clear discoverable
-		 * setting.
-		 */
-		if (adapter->current_settings & MGMT_SETTING_CONNECTABLE)
-			set_mode(MGMT_OP_SET_CONNECTABLE, 0x00);
+		/* Framework expects all properties to be emitted while
+		 * enabling adapter */
+		get_properties();
 
 		if (adapter->current_settings & MGMT_SETTING_POWERED) {
 			status = HAL_STATUS_DONE;