diff --git a/src/system/boot/loader/load_driver_settings.cpp b/src/system/boot/loader/load_driver_settings.cpp
index 5c775fc70b..cec73ca953 100644
--- a/src/system/boot/loader/load_driver_settings.cpp
+++ b/src/system/boot/loader/load_driver_settings.cpp
@@ -116,7 +116,7 @@ add_stage2_driver_settings(stage2_args* args)
 {
 	// TODO: split more intelligently
 	for (const char** arg = args->arguments;
-			arg != NULL && arg[0] != NULL; arg++) {
+			arg != NULL && args->arguments_count-- && arg[0] != NULL; arg++) {
 		dprintf("adding args: '%s'\n", arg[0]);
 		add_safe_mode_settings((char*)arg[0]);
 	}