diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index cab960767..02c5e8663 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -965,6 +965,15 @@ void setup()
 #if defined(Z_AXIS_ALWAYS_ON)
   enable_z();
 #endif
+
+  if (eeprom_read_byte((unsigned char*)EEPROM_BABYSTEP_Z_SET) == 0x0ff) {
+      lang_selected = eeprom_read_byte((unsigned char*)EEPROM_LANG);
+      if (lang_selected >= LANG_NUM)
+          lang_selected = 1;
+      lcd_show_fullscreen_message_and_wait_P(MSG_BABYSTEP_Z_NOT_SET);
+      lcd_update_enable(true);
+      lcd_implementation_clear();
+  }
 }
 
 // The loop() function is called in an endless loop by the Arduino framework from the default main() routine.
diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp
index 9be16d34d..8bdd44124 100644
--- a/Firmware/language_all.cpp
+++ b/Firmware/language_all.cpp
@@ -213,6 +213,19 @@ const char * const MSG_BABYSTEP_Z_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_BABYSTEP_Z_PL
 };
 
+const char MSG_BABYSTEP_Z_NOT_SET_EN[] PROGMEM = "Printer has not been calibrated yet. Run calibration G-code to adjust Z height.";
+const char MSG_BABYSTEP_Z_NOT_SET_CZ[] PROGMEM = "Tiskarna nebyla jeste zkalibrovana. Spustte kalibracni G-kod a doladte Z.";
+const char MSG_BABYSTEP_Z_NOT_SET_IT[] PROGMEM = "Printer has not been calibrated yet. Run calibration G-code to adjust Z height.";
+const char MSG_BABYSTEP_Z_NOT_SET_ES[] PROGMEM = "Printer has not been calibrated yet. Run calibration G-code to adjust Z height.";
+const char MSG_BABYSTEP_Z_NOT_SET_PL[] PROGMEM = "Printer has not been calibrated yet. Run calibration G-code to adjust Z height.";
+const char * const MSG_BABYSTEP_Z_NOT_SET_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_BABYSTEP_Z_NOT_SET_EN,
+	MSG_BABYSTEP_Z_NOT_SET_CZ,
+	MSG_BABYSTEP_Z_NOT_SET_IT,
+	MSG_BABYSTEP_Z_NOT_SET_ES,
+	MSG_BABYSTEP_Z_NOT_SET_PL
+};
+
 const char MSG_BED_EN[] PROGMEM = "Bed";
 const char MSG_BED_CZ[] PROGMEM = "Bed";
 const char MSG_BED_IT[] PROGMEM = "Piatto";
diff --git a/Firmware/language_all.h b/Firmware/language_all.h
index 1654717c1..f39419754 100644
--- a/Firmware/language_all.h
+++ b/Firmware/language_all.h
@@ -40,6 +40,8 @@ extern const char* const MSG_BABYSTEP_Y_LANG_TABLE[LANG_NUM];
 #define MSG_BABYSTEP_Y LANG_TABLE_SELECT(MSG_BABYSTEP_Y_LANG_TABLE)
 extern const char* const MSG_BABYSTEP_Z_LANG_TABLE[LANG_NUM];
 #define MSG_BABYSTEP_Z LANG_TABLE_SELECT(MSG_BABYSTEP_Z_LANG_TABLE)
+extern const char* const MSG_BABYSTEP_Z_NOT_SET_LANG_TABLE[LANG_NUM];
+#define MSG_BABYSTEP_Z_NOT_SET LANG_TABLE_SELECT(MSG_BABYSTEP_Z_NOT_SET_LANG_TABLE)
 extern const char* const MSG_BED_LANG_TABLE[LANG_NUM];
 #define MSG_BED LANG_TABLE_SELECT(MSG_BED_LANG_TABLE)
 extern const char* const MSG_BED_DONE_LANG_TABLE[LANG_NUM];
diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h
index 6d37355e6..e4e36909c 100644
--- a/Firmware/language_cz.h
+++ b/Firmware/language_cz.h
@@ -305,10 +305,11 @@
 #define MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR	"Kalibrace X/Y nepresna. Pravy predni bod moc vpredu."
 #define MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR	"Kalibrace X/Y nepresna. Predni kalibracni body moc vpredu."
 
-#define MSG_BED_LEVELING_FAILED_POINT_LOW				"Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."
-#define MSG_BED_LEVELING_FAILED_POINT_HIGH				"Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset."
+#define MSG_BED_LEVELING_FAILED_POINT_LOW						"Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."
+#define MSG_BED_LEVELING_FAILED_POINT_HIGH						"Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset."
 
 #define MSG_NEW_FIRMWARE_AVAILABLE								"Vysla nova verze firmware:"
 #define MSG_NEW_FIRMWARE_PLEASE_UPGRADE							"Prosim aktualizujte."
+#define MSG_BABYSTEP_Z_NOT_SET                          		"Tiskarna nebyla jeste zkalibrovana. Spustte kalibracni G-kod a doladte Z."
 
 #endif // LANGUAGE_EN_H
diff --git a/Firmware/language_en.h b/Firmware/language_en.h
index ccb3115bc..4ea916504 100644
--- a/Firmware/language_en.h
+++ b/Firmware/language_en.h
@@ -304,4 +304,6 @@
 #define MSG_NEW_FIRMWARE_AVAILABLE								"New firmware version available:"
 #define MSG_NEW_FIRMWARE_PLEASE_UPGRADE							"Please upgrade."
 
+#define MSG_BABYSTEP_Z_NOT_SET									"Printer has not been calibrated yet. Run calibration G-code to adjust Z height."
+
 #endif // LANGUAGE_EN_H