diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/Annotation.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/Annotation.as
index 8733c42867ef1be421a0c3e4d81ba41eba084f29..4c7246185f27876dcd16c0eaadce98eee44d31c7 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/Annotation.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/Annotation.as
@@ -62,7 +62,7 @@ package org.bigbluebutton.lib.whiteboard.models {
 				_status = an.status;
 				_annInfo = an.annInfo;
 				
-				if (_parentHeight > 0 && _parentWidth > 0) {
+				if (shouldDraw()) {
 					makeGraphic();
 				}
 			}
@@ -75,7 +75,7 @@ package org.bigbluebutton.lib.whiteboard.models {
 			if (_parentWidth != width || _parentHeight != height) {
 				_parentWidth = width;
 				_parentHeight = height;
-				if (_parentWidth > 0 && _parentHeight > 0) {
+				if (shouldDraw()) {
 					makeGraphic();
 				}
 			}
@@ -85,5 +85,9 @@ package org.bigbluebutton.lib.whiteboard.models {
 			_parentWidth = 0;
 			_parentHeight = 0;
 		}
+		
+		protected function shouldDraw():Boolean {
+			return _parentHeight > 0 && _parentWidth > 0;
+		}
 	}
 }
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/PencilAnnotation.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/PencilAnnotation.as
index 37c9ddae576c7302148b794136e748260ae63f8d..4d667a347fee62c2d56885859e19820da536bc3d 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/PencilAnnotation.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/whiteboard/models/PencilAnnotation.as
@@ -35,15 +35,19 @@ package org.bigbluebutton.lib.whiteboard.models {
 					an.annInfo.points = annInfo.points.concat(an.annInfo.points);
 					_annInfo = an.annInfo;
 					
-					var newSegment:String = "";
-					for (var i:int = 0; i < newPoints.length; ) {
-						newSegment += "L ";
-						newSegment += denormalize(newPoints[i++], _parentWidth) + " " + denormalize(newPoints[i++], _parentHeight) + " ";
+					if (shouldDraw()) {
+						var newSegment:String = "";
+						for (var i:int = 0; i < newPoints.length; ) {
+							newSegment += "L ";
+							newSegment += denormalize(newPoints[i++], _parentWidth) + " " + denormalize(newPoints[i++], _parentHeight) + " ";
+						}
+						_path.data += newSegment;
 					}
-					_path.data += newSegment;
 				} else {
 					_annInfo = an.annInfo;
-					makeGraphic();
+					if (shouldDraw()) {
+						makeGraphic();
+					}
 				}
 			}
 		}