diff --git a/src/extensions/renderer/base/coord-ele-math/labels.js b/src/extensions/renderer/base/coord-ele-math/labels.js
index 7118ae10d..db5239f0a 100644
--- a/src/extensions/renderer/base/coord-ele-math/labels.js
+++ b/src/extensions/renderer/base/coord-ele-math/labels.js
@@ -301,7 +301,8 @@ BRp.applyPrefixedLabelDimensions = function( ele, prefix ){
   let labelDims = this.calculateLabelDimensions( ele, text );
   let lineHeight = ele.pstyle('line-height').pfValue;
   let textWrap = ele.pstyle('text-wrap').strValue;
-  let numLines = textWrap !== 'wrap' ? 1 : (util.getPrefixedProperty( _p.rscratch, 'labelWrapCachedLines', prefix ).length || 1);
+  let lines = util.getPrefixedProperty( _p.rscratch, 'labelWrapCachedLines', prefix ) || [];
+  let numLines = textWrap !== 'wrap' ? 1 : Math.max(lines.length, 1);
   let normPerLineHeight = labelDims.height / numLines;
   let labelLineHeight = normPerLineHeight * lineHeight;
 
@@ -314,7 +315,7 @@ BRp.applyPrefixedLabelDimensions = function( ele, prefix ){
   util.setPrefixedProperty( _p.rstyle,   'labelHeight', prefix, height );
   util.setPrefixedProperty( _p.rscratch, 'labelHeight', prefix, height );
 
-  _p.rscratch.labelLineHeight = labelLineHeight;
+  util.setPrefixedProperty( _p.rscratch, 'labelLineHeight', prefix, labelLineHeight );
 };
 
 BRp.getLabelText = function( ele, prefix ){
diff --git a/src/extensions/renderer/canvas/drawing-label-text.js b/src/extensions/renderer/canvas/drawing-label-text.js
index 002f96a96..68a24fbd4 100644
--- a/src/extensions/renderer/canvas/drawing-label-text.js
+++ b/src/extensions/renderer/canvas/drawing-label-text.js
@@ -319,7 +319,7 @@ CRp.drawText = function( context, ele, prefix, applyRotation = true, useEleOpaci
 
     if( ele.pstyle( 'text-wrap' ).value === 'wrap' ){
       let lines = util.getPrefixedProperty( rscratch, 'labelWrapCachedLines', prefix );
-      let lineHeight = _p.rscratch.labelLineHeight;
+      let lineHeight = util.getPrefixedProperty( rscratch, 'labelLineHeight', prefix );
       let halfTextW = textW/2;
       let justification = this.getLabelJustification(ele);