diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index c1b3c0e9f7d1b1224fbd14c7573da360029e5867..bbc7a162d819b118c29b6071067dd4a9034820c5 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1360,7 +1360,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 	struct mohclass *mohclass = NULL;
 	struct moh_files_state *state = ast_channel_music_state(chan);
 	struct ast_variable *var = NULL;
-	int res = 0;
+	int res;
 	int realtime_possible = ast_check_realtime("musiconhold");
 
 	/* The following is the order of preference for which class to use:
@@ -1558,12 +1558,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 
 	ast_set_flag(ast_channel_flags(chan), AST_FLAG_MOH);
 
-	if (!state || strcmp(mohclass->name, state->class->name)) {
-		if (mohclass->total_files) {
-			res = ast_activate_generator(chan, &moh_file_stream, mohclass);
-		} else {
-			res = ast_activate_generator(chan, &mohgen, mohclass);
-		}
+	if (mohclass->total_files) {
+		res = ast_activate_generator(chan, &moh_file_stream, mohclass);
+	} else {
+		res = ast_activate_generator(chan, &mohgen, mohclass);
 	}
 
 	mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");