diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index abb153616a..b532c158bc 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.221 2004/04/19 17:22:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.222 2004/04/19 21:58:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2599,7 +2599,7 @@ CopyAttributeOutCSV(char *server_string, char *delim, char *quote,
 
 	for (; (c = *string) != '\0'; string += mblen)
 	{
-		if (c == quotec || c == escapec)
+		if (need_quote && (c == quotec || c == escapec))
 			CopySendChar(escapec);
 
 		CopySendChar(c);