diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e792741c9..1c3211d6e 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3416,7 +3416,10 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
 
 	do {
 		if (msg <= CRCInput::RC_MaxRC) {
-			if ((msg == CRCInput::RC_plus) || (msg == CRCInput::RC_right)) {
+			if ((msg == CRCInput::RC_plus) || 
+			    ((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) && 
+ 			     (g_RemoteControl->subChannels.size() < 1) &&
+			     (msg == CRCInput::RC_right))) {
 				if (g_settings.current_volume < 100 - g_settings.current_volume_step)
 					g_settings.current_volume += g_settings.current_volume_step;
 				else
@@ -3425,7 +3428,10 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
 					AudioMute( false, true);
 				}
 			}
-			else if ((msg == CRCInput::RC_minus) || (msg == CRCInput::RC_left)) {
+			else if ((msg == CRCInput::RC_minus) ||
+			    ((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) && 
+ 			     (g_RemoteControl->subChannels.size() < 1) &&
+			     (msg == CRCInput::RC_left))) {
 				if (g_settings.current_volume > g_settings.current_volume_step)
 					g_settings.current_volume -= g_settings.current_volume_step;
 				else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1))