diff --git a/src/barebox-state.c b/src/barebox-state.c
index 4179e64..5332efc 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -563,11 +563,11 @@
 
 		if (statename_end) {
 			statename_len = statename_end - sg->arg;
-			arg = statename_end + 1;
 
 			list_for_each_entry(state, &state_list.list, list) {
 				if (strlen(state->name) == statename_len &&
 				    !strncmp(state->name, sg->arg, statename_len))
+					arg = statename_end + 1;
 					break;
 			}
 		}