diff --git a/src/include/init.h b/src/include/init.h
index f2234c8f..58335c46 100644
--- a/src/include/init.h
+++ b/src/include/init.h
@@ -171,8 +171,8 @@ void *pathman_cache_search_relid(HTAB *cache_table,
 /*
  * Save and restore PathmanInitState.
  */
-void save_pathman_init_state(PathmanInitState *temp_init_state);
-void restore_pathman_init_state(const PathmanInitState *temp_init_state);
+void save_pathman_init_state(volatile PathmanInitState *temp_init_state);
+void restore_pathman_init_state(const volatile PathmanInitState *temp_init_state);
 
 /*
  * Create main GUC variables.
diff --git a/src/init.c b/src/init.c
index 9f72bcb7..bdec28fd 100644
--- a/src/init.c
+++ b/src/init.c
@@ -134,13 +134,13 @@ pathman_cache_search_relid(HTAB *cache_table,
  */
 
 void
-save_pathman_init_state(PathmanInitState *temp_init_state)
+save_pathman_init_state(volatile PathmanInitState *temp_init_state)
 {
 	*temp_init_state = pathman_init_state;
 }
 
 void
-restore_pathman_init_state(const PathmanInitState *temp_init_state)
+restore_pathman_init_state(const volatile PathmanInitState *temp_init_state)
 {
  	/*
 	 * initialization_needed is not restored: it is not just a setting but
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
index b638fc47..809884c2 100644
--- a/src/pl_funcs.c
+++ b/src/pl_funcs.c
@@ -796,7 +796,7 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 
 	Oid					expr_type;
 
-	PathmanInitState	init_state;
+	volatile PathmanInitState	init_state;
 
 	if (!IsPathmanReady())
 		elog(ERROR, "pg_pathman is disabled");