diff --git a/src/ascii_cmd.c b/src/ascii_cmd.c
index f3f0f4d..fb3c0e7 100644
--- a/src/ascii_cmd.c
+++ b/src/ascii_cmd.c
@@ -741,14 +741,8 @@ void process_ascii_cmd(RDSModulator* mod, char *str) {
 			copy_len = sizeof(option) - 1;
 		memcpy(option, option_str, copy_len);
 		option[copy_len] = '\0';
-		if (strcmp(option, "RDSGEN") == 0 || strcmp(option, "LEVEL") == 0) {
-			Modulator_saveToFile(&mod->params, option);
-		} else {
-			saveToFile(mod->enc, option);
-			if (strcmp(option, "ALL") == 0) {
-				Modulator_saveToFile(&mod->params, option);
-			}
-		}
+		saveToFile(mod->enc, option);
+		Modulator_saveToFile(&mod->params, option);
 		return;
 	}
 
diff --git a/src/rds.c b/src/rds.c
index b743da0..eb2e309 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -114,6 +114,8 @@ void saveToFile(RDSEncoder *emp, const char *option) {
 		memcpy(&(tempEncoder.oda_state[emp->program]), &(emp->oda_state[emp->program]), sizeof(RDSODAState));
 		memcpy(&(tempEncoder.encoder_data), &(emp->encoder_data), sizeof(RDSEncoderData));
 		tempEncoder.program = emp->program;
+	} else {
+		return;
 	}
 
 	RDSEncoderFile rdsEncoderfile;