diff --git a/Ooui/CanvasRenderingContext2D.cs b/Ooui/CanvasRenderingContext2D.cs
index f7723fe..d8527a5 100644
--- a/Ooui/CanvasRenderingContext2D.cs
+++ b/Ooui/CanvasRenderingContext2D.cs
@@ -71,6 +71,7 @@ namespace Ooui
         public CanvasRenderingContext2D ()
             : base ("#canvasRenderingContext2D")
         {
+            UpdateStateMessages (ms => ms.Clear ());
         }
     }
 
diff --git a/Tests/CanvasTests.cs b/Tests/CanvasTests.cs
index b181741..d34cfa6 100644
--- a/Tests/CanvasTests.cs
+++ b/Tests/CanvasTests.cs
@@ -18,6 +18,7 @@ namespace Tests
             var c2d2 = c.GetContext2D ();
             Assert.AreEqual (2, c.StateMessages.Count);
             Assert.AreEqual (c2d, c2d2);
+            Assert.AreEqual (0, c2d.StateMessages.Count);
         }
 
         [TestMethod]