diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 1e24af8ac..8a714504d 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2732,8 +2732,6 @@ videomenu.videomode Videosystem
 videomenu.zappingmode Umschaltmodus
 videomenu.zappingmode_mute Schwarzes Bild
 videomenu.zappingmode_hold Standbild
-videomenu.zappingmode_mutetilllock Schwarzes Bild bis lock
-videomenu.zappingmode_holdtilllock Standbild bis lock
 weather.api_key Wetter API Schlüssel (Dark Sky)
 weather.enabled Wetter-Unterstützung
 weather.location Wetter-Standort
diff --git a/data/locale/english.locale b/data/locale/english.locale
index b252a6618..29193a783 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2732,8 +2732,6 @@ videomenu.videomode Digital video mode
 videomenu.zappingmode Zap mode
 videomenu.zappingmode_mute Black screen
 videomenu.zappingmode_hold Hold screen
-videomenu.zappingmode_mutetilllock Black screen until locked
-videomenu.zappingmode_holdtilllock Hold screen until locked
 weather.api_key Weather API key (Dark Sky)
 weather.enabled Weather support
 weather.location Weather location
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index dda05959c..5eedf5336 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -328,13 +328,11 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO
 };
 
 #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
-#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 4
+#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2
 CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] =
 {
 	{ 0, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE },
-	{ 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD },
-	{ 2, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK },
-	{ 3, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK }
+	{ 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD }
 };
 #endif
 
diff --git a/src/system/locals.h b/src/system/locals.h
index 16198df5a..f45c9a082 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2759,8 +2759,6 @@ typedef enum
 	LOCALE_VIDEOMENU_ZAPPINGMODE,
 	LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE,
 	LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD,
-	LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK,
-	LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK,
 	LOCALE_WEATHER_API_KEY,
 	LOCALE_WEATHER_ENABLED,
 	LOCALE_WEATHER_LOCATION,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index d0a56a721..7e7586033 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2759,8 +2759,6 @@ const char * locale_real_names[] =
 	"videomenu.zappingmode",
 	"videomenu.zappingmode_mute",
 	"videomenu.zappingmode_hold",
-	"videomenu.zappingmode_mutetilllock",
-	"videomenu.zappingmode_holdtilllock",
 	"weather.api_key",
 	"weather.enabled",
 	"weather.location",