diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index c60de0429..56c9b76e7 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -5766,7 +5766,10 @@ begin
               lRow^.Height := CalcRowHeightToSheet(round(h / ZoomFactor));
             end else
               // If autocalc mode is off we just take the row height from the row record
-              h := round(CalcRowHeightFromSheet(lRow^.Height) * ZoomFactor);
+              case lRow^.RowHeightType of
+                rhtDefault : h := DefaultRowHeight;
+                rhtAuto    : h := round(CalcRowHeightFromSheet(lRow^.Height) * ZoomFactor);
+              end;
           end;
       end;  // case
     end else