diff --git a/app/assets/javascripts/discourse/dialects/table_dialect.js b/app/assets/javascripts/discourse/dialects/table_dialect.js
index d73393023e2..ad1bb375dff 100644
--- a/app/assets/javascripts/discourse/dialects/table_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/table_dialect.js
@@ -23,7 +23,7 @@ var emitter = function(contents) {
 };
 
 var tableBlock = {
-  start: /(<table>)([\S\s]*)/igm,
+  start: /(<table[^>]*>)([\S\s]*)/igm,
   stop: /<\/table>/igm,
   rawContents: true,
   emitter: emitter,
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index de5e3fbb9cc..bbbcb5d699f 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -343,7 +343,7 @@ describe PrettyText do
     it 'allows table html' do
       SiteSetting.allow_html_tables = true
       PrettyText.reset_context
-      table = "<table><thead><tr>\n<th>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
+      table = "<table class='fa-spin'><thead><tr>\n<th>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
       match = "<table class=\"md-table\"><thead><tr> <th>test</th> </tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
       expect(PrettyText.cook(table)).to match_html(match)