diff --git a/src/TextareaAutosize.tsx b/src/TextareaAutosize.tsx
index 5173a20..2b40506 100644
--- a/src/TextareaAutosize.tsx
+++ b/src/TextareaAutosize.tsx
@@ -121,12 +121,16 @@ export default class TextareaAutosize extends React.Component<TextareaAutosize.P
       saveDOMNodeRef
     } = this;
 
-    const maxHeight = maxRows && lineHeight ? lineHeight * maxRows : null;
+    const maxHeight = typeof maxRows !== 'undefined' && lineHeight ? lineHeight * maxRows : null;
 
     return {
       ...props,
       saveDOMNodeRef,
-      style: maxHeight ? { ...style, maxHeight } : style,
+      style: maxHeight ? {
+        boxSizing: typeof maxRows !== 'undefined' ? 'content-box' : undefined,
+        ...style,
+        maxHeight
+      } : style,
       onChange: this.onChange
     };
   }