diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
index caf444fba..70a01ee4e 100644
--- a/src/ejabberd_router.erl
+++ b/src/ejabberd_router.erl
@@ -396,6 +396,7 @@ update_tables() ->
       [domain, node, pid] -> mnesia:delete_table(route);
       [domain, pid] -> mnesia:delete_table(route);
       [domain, pid, local_hint] -> ok;
+      [domain, pid, local_hint|_] -> mnesia:delete_table(route);
       {'EXIT', _} -> ok
     end,
     case lists:member(local_route,
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 3ef21ade4..2a06fd2f8 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -843,6 +843,7 @@ update_tables() ->
       [ur, user, node] -> mnesia:delete_table(session);
       [ur, user, pid] -> mnesia:delete_table(session);
       [usr, us, pid] -> mnesia:delete_table(session);
+      [usr, us, sid, priority, info] -> mnesia:delete_table(session);
       [sid, usr, us, priority] ->
 	  mnesia:delete_table(session);
       [sid, usr, us, priority, info] -> ok;