diff --git a/tools/ei-demo-client.c b/tools/ei-demo-client.c
index 2600d56..df704de 100644
--- a/tools/ei-demo-client.c
+++ b/tools/ei-demo-client.c
@@ -331,16 +331,16 @@ int main(int argc, char **argv)
 
 				if (ei_device_has_capability(device, EI_DEVICE_CAP_POINTER)) {
 					colorprint("New pointer device: %s\n", ei_device_get_name(device));
-					ptr = device;
+					ptr = ei_device_ref(device);
 				}
 				if (ei_device_has_capability(device, EI_DEVICE_CAP_KEYBOARD)) {
 					colorprint("New keyboard device: %s\n", ei_device_get_name(device));
-					kbd = device;
+					kbd = ei_device_ref(device);
 					handle_keymap(e);
 				}
 				if (ei_device_has_capability(device, EI_DEVICE_CAP_POINTER_ABSOLUTE)) {
 					colorprint("New abs pointer device: %s\n", ei_device_get_name(device));
-					abs = device;
+					abs = ei_device_ref(device);
 					handle_regions(device);
 				}
 				}