diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 22e0825c54c27..f52ff884d83cd 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -5418,16 +5418,17 @@ static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret) /* {{{
 	switch (cast_as)	{
 		case PHP_STREAM_AS_FD_FOR_SELECT:
 		case PHP_STREAM_AS_FD:
-		case PHP_STREAM_AS_SOCKETD:
-			if (ret) {
+		case PHP_STREAM_AS_SOCKETD: {
 				int fd_number = PQsocket(pgsql);
 				if (fd_number == -1) {
 					return FAILURE;
 				}
 
-				*(php_socket_t *)ret = fd_number;
-				return SUCCESS;
+				if (ret) {
+					*(php_socket_t *)ret = fd_number;
+				}
 			}
+			return SUCCESS;
 		default:
 			return FAILURE;
 	}