diff --git a/src/core/text/TextMetrics.js b/src/core/text/TextMetrics.js
index d36d204..ab59b3c 100644
--- a/src/core/text/TextMetrics.js
+++ b/src/core/text/TextMetrics.js
@@ -46,7 +46,7 @@
      */
     static measureText(text, style, wordWrap, canvas = TextMetrics._canvas)
     {
-        wordWrap = wordWrap || style.wordWrap;
+        wordWrap = (wordWrap === undefined || wordWrap === null) ? style.wordWrap : wordWrap;
         const font = style.toFontString();
         const fontProperties = TextMetrics.measureFont(font);
         const context = canvas.getContext('2d');

diff --git a/src/core/text/TextMetrics.js b/src/core/text/TextMetrics.js
index d36d204..ab59b3c 100644
--- a/src/core/text/TextMetrics.js
+++ b/src/core/text/TextMetrics.js
@@ -46,7 +46,7 @@
      */
     static measureText(text, style, wordWrap, canvas = TextMetrics._canvas)
     {
-        wordWrap = wordWrap || style.wordWrap;
+        wordWrap = (wordWrap === undefined || wordWrap === null) ? style.wordWrap : wordWrap;
         const font = style.toFontString();
         const fontProperties = TextMetrics.measureFont(font);
         const context = canvas.getContext('2d');
diff --git a/test/core/TextMetrics.js b/test/core/TextMetrics.js
index 0a2d7f5..18feba9 100644
--- a/test/core/TextMetrics.js
+++ b/test/core/TextMetrics.js
@@ -125,6 +125,13 @@
                 expect(line[line - 1]).to.not.equal(' ', 'no lines should have a space at the end');
             });
         });
+
+        it('should be able to override wordWrap to false in measureText', function ()
+        {
+            const metrics = PIXI.TextMetrics.measureText(longText, new PIXI.TextStyle(defaultStyle), false);
+
+            expect(metrics.lines.length).to.equal(1);
+        });
     });
 
     describe('wordWrap with breakWords', function ()