diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 288c1a8c93..fae5940b54 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3896,7 +3896,7 @@ printSSLInfo(void)
 		   protocol ? protocol : _("unknown"),
 		   cipher ? cipher : _("unknown"),
 		   (compression && strcmp(compression, "off") != 0) ? _("on") : _("off"),
-		   alpn ? alpn : _("none"));
+		   (alpn && alpn[0] != '\0') ? alpn : _("none"));
 }
 
 /*
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index e7a4d006e1..33362000d3 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1837,7 +1837,7 @@ PQsslAttribute(PGconn *conn, const char *attribute_name)
 
 		SSL_get0_alpn_selected(conn->ssl, &data, &len);
 		if (data == NULL || len == 0 || len > sizeof(alpn_str) - 1)
-			return NULL;
+			return "";
 		memcpy(alpn_str, data, len);
 		alpn_str[len] = 0;
 		return alpn_str;