diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 955a4ccadb7..56fa337dc75 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -893,7 +893,9 @@ psql_scan_create(const PsqlScanCallbacks *callbacks)
 
 	state->callbacks = callbacks;
 
-	yylex_init_extra(state, &state->scanner);
+	yylex_init(&state->scanner);
+
+	yyset_extra(state, state->scanner);
 
 	psql_scan_reset(state);