diff --git a/src/minibuf.c b/src/minibuf.c
index c9831fd50f..6d4c2848f6 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -862,6 +862,12 @@ read_minibuf (Lisp_Object map, Lisp_Object initial,
Lisp_Object prompt,
if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method)))
call1 (Qactivate_input_method, input_method);
+ if (! EQ (Vminibuffer_local_completion_table, Qnil)) {
+ Fmake_local_variable (Qminibuffer_completion_table);
+ Fset (Qminibuffer_completion_table, Vminibuffer_local_completion_table);
+ specbind (Qminibuffer_local_completion_table, Qnil);
+ }
+
run_hook (Qminibuffer_setup_hook);