diff --git a/tools/btpclient.c b/tools/btpclient.c
index f2c79b3..3c88f14 100644
--- a/tools/btpclient.c
+++ b/tools/btpclient.c
@@ -54,6 +54,7 @@ struct btp_adapter {
 	uint8_t index;
 	uint32_t supported_settings;
 	uint32_t current_settings;
+	uint32_t default_settings;
 	struct l_queue *devices;
 };
 
@@ -458,6 +459,8 @@ static void btp_gap_reset(uint8_t index, const void *param, uint16_t length,
 			goto failed;
 		}
 
+	adapter->current_settings = adapter->default_settings;
+
 	/* TODO for we assume all went well */
 	btp_send(btp, BTP_GAP_SERVICE, BTP_OP_GAP_RESET, index, 0, NULL);
 	return;
@@ -1852,6 +1855,8 @@ static void proxy_added(struct l_dbus_proxy *proxy, void *user_data)
 		extract_settings(proxy, &adapter->current_settings,
 						&adapter->supported_settings);
 
+		adapter->default_settings = adapter->current_settings;
+
 		l_queue_push_tail(adapters, adapter);
 		return;
 	}