diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 46fe6c7a84..bd0fe1bb7b 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -462,7 +462,7 @@ void updateDevConsoleState(void) {
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 	// todo: unify with simulator!
 	if (hasFirmwareError()) {
-		scheduleMsg(&logger, "FATAL error: %s", errorMessageBuffer);
+		scheduleMsg(&logger, "FATAL error: %s", getFirmwareError());
 		warningEnabled = false;
 		scheduleLogging(&logger);
 		return;
diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp
index 91da50cbfe..b7a5ac61e5 100644
--- a/firmware/controllers/lcd_controller.cpp
+++ b/firmware/controllers/lcd_controller.cpp
@@ -333,7 +333,7 @@ void updateHD44780lcd(void) {
 	}
 
 
-	const char * message = hasFirmwareErrorFlag ? (char *)&errorMessageBuffer : getWarning();
+	const char * message = hasFirmwareErrorFlag ? getFirmwareError() : getWarning();
 	memcpy(buffer, message, engineConfiguration->HD44780width);
 	buffer[engineConfiguration->HD44780width] = 0;
 	lcd_HD44780_set_position(engineConfiguration->HD44780height - 1, 0);