diff --git a/libraries/LiquidCrystal/src/LiquidCrystal.cpp b/libraries/LiquidCrystal/src/LiquidCrystal.cpp
index 5dbb830f9..27b53772f 100644
--- a/libraries/LiquidCrystal/src/LiquidCrystal.cpp
+++ b/libraries/LiquidCrystal/src/LiquidCrystal.cpp
@@ -182,6 +182,10 @@ void LiquidCrystal::home()
 
 void LiquidCrystal::setCursor(uint8_t col, uint8_t row)
 {
+  const size_t max_lines = sizeof(_row_offsets) / sizeof(*_row_offsets);
+  if ( row >= max_lines ) {
+    row = max_lines - 1;    // we count rows starting w/0
+  }
   if ( row >= _numlines ) {
     row = _numlines - 1;    // we count rows starting w/0
   }