diff --git a/src/canvas.js b/src/canvas.js
index 058b57b7e..122dd5e59 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -1258,7 +1258,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
   return CanvasGraphics;
 })();
 
-if (!isWorker) {
+function checkPutBinaryImageDataCompatibility() {
   // Feature detection if the browser can use an Uint8Array directly as imgData.
   var canvas = document.createElement('canvas');
   canvas.width = 1;
@@ -1293,3 +1293,6 @@ if (!isWorker) {
       };
   }
 }
+if (!isWorker) {
+  checkPutBinaryImageDataCompatibility();
+}
diff --git a/web/viewer.js b/web/viewer.js
index 7276d2cbd..03766ab19 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1704,6 +1704,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
       if (textDivs.length === 0) {
         clearInterval(renderTimer);
         renderingDone = true;
+        self.textLayerDiv = textLayerDiv = canvas = ctx = null;
         return;
       }
       var textDiv = textDivs.shift();