diff --git a/src/libei.c b/src/libei.c
index dc591b0..9526f1e 100644
--- a/src/libei.c
+++ b/src/libei.c
@@ -302,6 +302,9 @@ ei_remove_device(struct ei_device *device)
 	struct ei *ei = ei_device_get_context(device);
 	int rc = connection_send_remove(ei, device);
 
+	if (ei->state == EI_STATE_DISCONNECTING)
+		ei_queue_removed_event(device);
+
 	list_remove(&device->link);
 	ei_device_unref(device);