diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index b811ce0..f7a7553 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -1500,7 +1500,7 @@ swap_registered_device(InputInfoPtr pInfo)
 		return;
 
 	next = xf86FirstLocalDevice();
-	while (next == pInfo || !is_libinput_device(next))
+	while (next && (next == pInfo || !is_libinput_device(next)))
 		next = next->next;
 
 	input_lock();