diff --git a/android/tester-main.c b/android/tester-main.c
index 40416d7..c868943 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -543,8 +543,15 @@ static gboolean verify_action(gpointer user_data)
 
 static gboolean verify_callback(gpointer user_data)
 {
+	struct test_data *data = tester_get_data();
 	struct step *step = user_data;
 
+	/* Return if callback came when all steps are already verified */
+	if (queue_isempty(data->steps)) {
+		destroy_callback_step(step);
+		return FALSE;
+	}
+
 	/*
 	 * TODO: This may call action from next step before callback data
 	 * from previous step was freed.