diff --git a/config/vim/lsp.vim b/config/vim/lsp.vim
index fe37cb2..1d45473 100644
--- a/config/vim/lsp.vim
+++ b/config/vim/lsp.vim
@@ -118,7 +118,10 @@ def MissingServers(): list<dict<any>>
 enddef
 
 export def LazyConfigure(): void
-	autocmd VimEnter * ++once Configure()
+	augroup lspLazyConfigure
+		autocmd!
+		autocmd VimEnter * ++once Configure()
+	augroup END
 enddef
 
 export def Configure(): void
diff --git a/config/vim/plugins.vim b/config/vim/plugins.vim
index fa7184c..3058518 100644
--- a/config/vim/plugins.vim
+++ b/config/vim/plugins.vim
@@ -4,7 +4,7 @@ if !exists('g:loaded_minpac')
 	silent !git clone https://github.com/k-takata/minpac.git $XDG_CACHE_HOME/vim/pack/minpac/opt/minpac
 	augroup minpac
 		autocmd!
-		autocmd VimEnter * call minpac#update()
+		autocmd VimEnter * ++once minpac#update()
 	augroup END
 endif
 packadd minpac