diff --git a/lib/distributions.sh b/lib/distributions.sh
index f9ba5c295a..80230c8d0d 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -147,6 +147,11 @@ install_common()
 	# switch to beta repository at this stage if building nightly images
 	[[ $IMAGE_TYPE == nightly ]] && echo "deb http://beta.armbian.com $RELEASE main ${RELEASE}-utils ${RELEASE}-desktop" > $SDCARD/etc/apt/sources.list.d/armbian.list
 
+	# Cosmetic fix [FAILED] Failed to start Set console font and keymap at first boot
+	sed -i "s/^printf '.*/printf '\\\033\%\%G'/g" $SDCARD/etc/console-setup/cached_setup_font.sh
+	sed -i "s/^printf '.*/printf '\\\033\%\%G'/g" $SDCARD/etc/console-setup/cached_setup_terminal.sh
+	sed -i "s/-u/-x'/g" $SDCARD/etc/console-setup/cached_setup_keyboard.sh
+
 	# disable low-level kernel messages for non betas
 	# TODO: enable only for desktop builds?
 	if [[ -z $BETA ]]; then