diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 02bb3f172..5f006a015 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -755,8 +755,8 @@ other			.
 					ECHO;
 					if (cur_state->is_end_state) {
 						RESET_XP_STATUS() ;
-						return LEXRES_SEMI;
 						cur_state->is_end_state = false;
+						return LEXRES_SEMI;
 					}
 				}
 <xui>{xuistop1}	{