diff --git a/app/assets/javascripts/defer/html-sanitizer-bundle.js b/app/assets/javascripts/defer/html-sanitizer-bundle.js
index 90f9536e519..e803241a4e8 100644
--- a/app/assets/javascripts/defer/html-sanitizer-bundle.js
+++ b/app/assets/javascripts/defer/html-sanitizer-bundle.js
@@ -831,8 +831,6 @@ html4.ATTRIBS = {
   'bdo::dir': 0,
   'blockquote::cite': 1,
   'br::clear': 0,
-  'canvas::height': 0,
-  'canvas::width': 0,
   'caption::align': 0,
   'col::align': 0,
   'col::char': 0,
@@ -1027,7 +1025,6 @@ html4.ELEMENTS = {
   'blockquote': 0,
   'body': 305,
   'br': 2,
-  'canvas': 0,
   'caption': 0,
   'cite': 0,
   'code': 0,
@@ -1148,7 +1145,6 @@ html4.ELEMENT_DOM_INTERFACES = {
   'blockquote': 'HTMLQuoteElement',
   'body': 'HTMLBodyElement',
   'br': 'HTMLBRElement',
-  'canvas': 'HTMLCanvasElement',
   'caption': 'HTMLTableCaptionElement',
   'cite': 'HTMLElement',
   'code': 'HTMLElement',
diff --git a/test/javascripts/lib/markdown_test.js b/test/javascripts/lib/markdown_test.js
index a318ccd7bee..64f826c4aa4 100644
--- a/test/javascripts/lib/markdown_test.js
+++ b/test/javascripts/lib/markdown_test.js
@@ -351,6 +351,7 @@ test("sanitize", function() {
          "it allows iframe to google maps");
   equal(sanitize("<textarea>hullo</textarea>"), "hullo");
   equal(sanitize("<button>press me!</button>"), "press me!");
+  equal(sanitize("<canvas>draw me!</canvas>"), "draw me!");
 });
 
 test("URLs in BBCode tags", function() {