diff --git a/dpadrecyclerview-testing/src/androidTest/java/com/rubensousa/dpadrecyclerview/testing/DpadTestAdapter.kt b/dpadrecyclerview-testing/src/androidTest/java/com/rubensousa/dpadrecyclerview/testing/DpadTestAdapter.kt
index 55c36571..c4dd2b36 100644
--- a/dpadrecyclerview-testing/src/androidTest/java/com/rubensousa/dpadrecyclerview/testing/DpadTestAdapter.kt
+++ b/dpadrecyclerview-testing/src/androidTest/java/com/rubensousa/dpadrecyclerview/testing/DpadTestAdapter.kt
@@ -79,7 +79,7 @@ class DpadTestAdapter(
     }
 
     fun removeItem() {
-        items.removeLast()
+        items.removeLastOrNull()
         notifyItemRemoved(items.size)
     }