diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 1bacb116a1..dd9b8a5176 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1119,7 +1119,7 @@ static void moh_parse_options(struct ast_variable *var, struct mohclass *mohclas
 			} else if (!strcasecmp(var->value, "randstart")) {
 				ast_set_flag(mohclass, MOH_RANDSTART);
 			}
-		} else if (!strcasecmp(var->name, "format")) {
+		} else if (!strcasecmp(var->name, "format") && !ast_strlen_zero(var->value)) {
 			ao2_cleanup(mohclass->format);
 			mohclass->format = ast_format_cache_get(var->value);
 			if (!mohclass->format) {