diff --git a/common/js/common.js b/common/js/common.js
index 59374e574..1804e40ec 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -354,10 +354,10 @@ jQuery(function($) {
 	var color_scheme_check = $('#rhymix_color_scheme').is(':visible') ? 'dark' : 'light';
 	if (color_scheme_cookie && color_scheme_cookie !== color_scheme_check) {
 		XE.cookie.set('rx_color_scheme', color_scheme_check, { path: window.XE.URI(default_url).pathname(), expires: 365 });
-		$('body').addClass('color_scheme_' + color_scheme_check);
+		$('body').addClass('color_scheme_' + color_scheme_check).removeClass('color_scheme_' + (color_scheme_check === 'dark' ? 'light' : 'dark'));
 	} else if (color_scheme_check === 'dark') {
 		XE.cookie.set('rx_color_scheme', color_scheme_check, { path: window.XE.URI(default_url).pathname(), expires: 365 });
-		$('body').addClass('color_scheme_' + color_scheme_check);
+		$('body').addClass('color_scheme_' + color_scheme_check).removeClass('color_scheme_' + (color_scheme_check === 'dark' ? 'light' : 'dark'));
 		$('#rhymix_color_scheme').hide();
 	}