diff --git a/autoload/db_ui/query.vim b/autoload/db_ui/query.vim
index d407b07..1f53bbb 100644
--- a/autoload/db_ui/query.vim
+++ b/autoload/db_ui/query.vim
@@ -16,8 +16,8 @@ function! s:query.new(drawer) abort
   let instance.last_query_time = 0
   augroup dbui_async_queries
     autocmd!
-    autocmd User DBQueryPre call s:query_instance.start_query()
-    autocmd User DBQueryPost call s:query_instance.print_query_time()
+    autocmd User *DBExecutePre call s:query_instance.start_query()
+    autocmd User *DBExecutePost call s:query_instance.print_query_time()
   augroup END
   return instance
 endfunction