diff --git a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
index 0e0baf8d79..9bb05dcb93 100644
--- a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
+++ b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
@@ -290,8 +290,11 @@ MasterServerDevice::_HandleNodeMonitor(BMessage* message)
 						PRINT(("removing device '%s'\n", pointingDevice->DevicePath()));
 
 						if (_LockDevices()) {
-							if (fDevices.RemoveItem((void*)pointingDevice))
+							if (fDevices.RemoveItem((void*)pointingDevice)) {
+								
 								delete pointingDevice;
+								i--;
+							}
 							_UnlockDevices();
 						}
 					}