diff --git a/src/drawer.js b/src/drawer.js
index 02a036aa..2355a828 100644
--- a/src/drawer.js
+++ b/src/drawer.js
@@ -328,7 +328,11 @@ $.Drawer.prototype = {
                 // the viewport get rotated later on, we will need to resize it.
                 if (this.viewport.getRotation() === 0) {
                     var self = this;
-                    this.viewer.addOnceHandler('rotate', function resizeSketchCanvas() {
+                    this.viewer.addHandler('rotate', function resizeSketchCanvas() {
+                        if (self.viewport.getRotation() === 0) {
+                            return;
+                        }
+                        self.viewer.removeHandler('rotate', resizeSketchCanvas);
                         var sketchCanvasSize = self._calculateSketchCanvasSize();
                         self.sketchCanvas.width = sketchCanvasSize.x;
                         self.sketchCanvas.height = sketchCanvasSize.y;
@@ -422,8 +426,8 @@ $.Drawer.prototype = {
             this.context.globalCompositeOperation = compositeOperation;
         }
         if (bounds) {
-            // Internet Explorer and Microsoft Edge throw IndexSizeError 
-            // when you call context.drawImage with negative x or y 
+            // Internet Explorer and Microsoft Edge throw IndexSizeError
+            // when you call context.drawImage with negative x or y
             // or width or height greater than the canvas width or height respectively
             if (bounds.x < 0) {
                 bounds.width += bounds.x;
@@ -439,7 +443,7 @@ $.Drawer.prototype = {
             if (bounds.height > this.canvas.height) {
                 bounds.height = this.canvas.height;
             }
-            
+
             this.context.drawImage(
                 this.sketchCanvas,
                 bounds.x,