diff --git a/src/device.c b/src/device.c
index df440ce..8f73ce4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -4447,6 +4447,11 @@ void device_remove(struct btd_device *device, gboolean remove_stored)
 {
 	DBG("Removing device %s", device->path);
 
+	if (device->auto_connect) {
+		device->disable_auto_connect = TRUE;
+		device_set_auto_connect(device, FALSE);
+	}
+
 	if (device->bonding) {
 		uint8_t status;