diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index f9001dc56164c..c314e87091352 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1580,7 +1580,8 @@ PHP_FUNCTION(socket_recvfrom)
 
 			if (arg6 == NULL) {
 				zend_string_efree(recv_buf);
-				WRONG_PARAM_COUNT;
+				zend_argument_value_error(6, "must be specified when argument #1 ($socket) is of type AF_INET or AF_INET6");
+				RETURN_THROWS();
 			}
 
 			retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen);
@@ -1607,7 +1608,8 @@ PHP_FUNCTION(socket_recvfrom)
 
 			if (arg6 == NULL) {
 				zend_string_efree(recv_buf);
-				WRONG_PARAM_COUNT;
+				zend_argument_value_error(6, "must be specified when argument #1 ($socket) is of type AF_INET or AF_INET6");
+				RETURN_THROWS();
 			}
 
 			retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen);
diff --git a/ext/sockets/tests/socket_recvfrom_ipv4_missing_port_arg.phpt b/ext/sockets/tests/socket_recvfrom_ipv4_missing_port_arg.phpt
new file mode 100644
index 0000000000000..8d144a1005d99
--- /dev/null
+++ b/ext/sockets/tests/socket_recvfrom_ipv4_missing_port_arg.phpt
@@ -0,0 +1,17 @@
+--TEST--
+socket_recvfrom() with IPv4 socket missing port argument
+--EXTENSIONS--
+sockets
+--FILE--
+<?php
+$socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+
+try {
+	socket_recvfrom($socket, $buffering, 20, 0, $address);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: socket_recvfrom(): Argument #6 ($port) must be specified when argument #1 ($socket) is of type AF_INET or AF_INET6
diff --git a/ext/sockets/tests/socket_recvfrom_ipv6_missing_port_arg.phpt b/ext/sockets/tests/socket_recvfrom_ipv6_missing_port_arg.phpt
new file mode 100644
index 0000000000000..9c48c871c8535
--- /dev/null
+++ b/ext/sockets/tests/socket_recvfrom_ipv6_missing_port_arg.phpt
@@ -0,0 +1,17 @@
+--TEST--
+socket_recvfrom() with IPv6 socket missing port argument
+--EXTENSIONS--
+sockets
+--FILE--
+<?php
+$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
+
+try {
+	socket_recvfrom($socket, $buffering, 20, 0, $address);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: socket_recvfrom(): Argument #6 ($port) must be specified when argument #1 ($socket) is of type AF_INET or AF_INET6