diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 4f31f39a..207bc7a7 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -856,7 +856,7 @@ var EditSession = function(text, mode) {
 
     this.getRowHeight = function(config, row) {
         var rows;
-        if (!this.$useWrapMode) {
+        if (!this.$useWrapMode || !this.$wrapData[row]) {
             rows = 1;
         } else {
             rows = this.$wrapData[row].length + 1;