diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 8a435e28dfd..dc226f2fbca 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -298,11 +298,13 @@ rloop:
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("SSL error: %s", SSLerrmessage(ecode))));
-				/* fall through */
-			case SSL_ERROR_ZERO_RETURN:
 				errno = ECONNRESET;
 				n = -1;
 				break;
+			case SSL_ERROR_ZERO_RETURN:
+				/* connection was cleanly shut down by peer */
+				n = 0;
+				break;
 			default:
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
@@ -423,8 +425,14 @@ wloop:
 				ereport(COMMERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("SSL error: %s", SSLerrmessage(ecode))));
-				/* fall through */
+				errno = ECONNRESET;
+				n = -1;
+				break;
 			case SSL_ERROR_ZERO_RETURN:
+				/*
+				 * the SSL connnection was closed, leave it to the caller
+				 * to ereport it
+				 */
 				errno = ECONNRESET;
 				n = -1;
 				break;