diff --git a/src/emqttd_router.erl b/src/emqttd_router.erl
index d77a86488..0056d9eb5 100644
--- a/src/emqttd_router.erl
+++ b/src/emqttd_router.erl
@@ -57,10 +57,18 @@ mnesia(boot) ->
                 {type, bag},
                 {ram_copies, [node()]},
                 {record_name, mqtt_route},
-                {attributes, record_info(fields, mqtt_route)}]);
+                {attributes, record_info(fields, mqtt_route)}]),
+
+    ok = emqttd_mnesia:create_table(topic, [
+                {ram_copies, [node()]},
+                {record_name, mqtt_topic},
+                {attributes, record_info(fields, mqtt_topic)}]);
+
+m
 
 mnesia(copy) ->
-    ok = emqttd_mnesia:copy_table(mqtt_route, ram_copies).
+    ok = emqttd_mnesia:copy_table(mqtt_route, ram_copies),
+    ok = emqttd_mnesia:copy_table(topic).
 
 %%--------------------------------------------------------------------
 %% Start the Router