diff --git a/HISTORY b/HISTORY
index 91e84e4b..303e7805 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9399,3 +9399,5 @@ Video Disk Recorder Revision History
   Helmut Binder).
 - Fixed a compiler warning in ExchangeChars() (thanks to Helmut Binder).
 - Fixed a compiler warning and a possible buffer overflow in cCiMMI::SendAnswer().
+- Fixed a possible invalid lock sequence if the main menu is open and the user
+  switches to a channel that is currently not available, using the Channel+/- keys.
diff --git a/device.c b/device.c
index b112ae04..873734e4 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.28 2018/07/16 09:29:57 kls Exp $
+ * $Id: device.c 4.29 2019/05/06 13:10:36 kls Exp $
  */
 
 #include "device.h"
@@ -831,7 +831,7 @@ bool cDevice::SwitchChannel(int Direction)
            result = true;
         }
      else if (n != first)
-        Skins.Message(mtError, tr("Channel not available!"));
+        Skins.QueueMessage(mtError, tr("Channel not available!"));
      }
   return result;
 }