diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index ede197bebe..cf6c7778ee 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1660,8 +1660,8 @@ ExecQueryAndProcessResults(const char *query,
 		}
 
 		/* set variables on last result if all went well */
-		if (!is_watch && last && success)
-			SetResultVariables(result, true);
+		if (!is_watch && last)
+			SetResultVariables(result, success);
 
 		ClearOrSaveResult(result);
 		result = next_result;