diff --git a/stm-firmware/safety/safety-controller.c b/stm-firmware/safety/safety-controller.c
index 9455065..35a3250 100644
--- a/stm-firmware/safety/safety-controller.c
+++ b/stm-firmware/safety/safety-controller.c
@@ -907,6 +907,12 @@ static void safety_controller_handle_weighted_flags()
 
 	for (flag_index = 0u; flag_index < COUNT_OF(flags); flag_index++) {
 		current_flag = &flags[flag_index];
+
+		/* Continue if this flag is not set */
+		if (!error_flag_get_status(current_flag)) {
+			continue;
+		}
+
 		flag_weigth = get_flag_weight(current_flag);
 		switch (flag_weigth) {
 		case SAFETY_FLAG_CONFIG_WEIGHT_NONE: