diff --git a/src/buffer.c b/src/buffer.c
index 65ab22f..99d23ec 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -743,11 +743,12 @@
 #ifdef FEAT_JOB_CHANNEL
     channel_buffer_free(buf);
 #endif
-#ifdef FEAT_AUTOCMD
-    aubuflocal_remove(buf);
 
     buf_hashtab_remove(buf);
 
+#ifdef FEAT_AUTOCMD
+    aubuflocal_remove(buf);
+
     if (autocmd_busy)
     {
 	/* Do not free the buffer structure while autocommands are executing,