diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index f40b588..fad7ca4 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -404,7 +404,7 @@ endfunction
 
 function! jedi#configure_call_signatures()
     augroup jedi_call_signatures
-    au!
+    autocmd! * <buffer>
     if g:jedi#show_call_signatures == 2  " Command line call signatures
         autocmd InsertEnter <buffer> let g:jedi#first_col = s:save_first_col()
     endif
diff --git a/test/signatures.vim b/test/signatures.vim
index 5479724..5571876 100644
--- a/test/signatures.vim
+++ b/test/signatures.vim
@@ -21,6 +21,22 @@ describe 'signatures'
         Expect getline(1) == ''
     end
 
+    it 'multiple buffers'
+        set hidden
+        new
+        setfiletype python
+        redir => autocmds
+        autocmd jedi_call_signatures * <buffer>
+        redir END
+        Expect autocmds =~# 'jedi_call_signatures'
+        buffer #
+        redir => autocmds
+        autocmd jedi_call_signatures * <buffer>
+        redir END
+        Expect autocmds =~# 'jedi_call_signatures'
+        bd!
+    end
+
     it 'simple after CursorHoldI with only parenthesis'
         noautocmd normal o
         doautocmd CursorHoldI