diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 8cf43a3731..462c69a611 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -948,8 +948,10 @@ bool init_netplay(void *direct_host, const char *server, unsigned port)
 
    netplay_data = (netplay_t*)netplay_new(
          netplay_is_client ? direct_host : NULL,
-         netplay_is_client ? (!netplay_client_deferred ? server : server_address_deferred) : NULL,
-         netplay_is_client ? (!netplay_client_deferred ? port   : server_port_deferred   ) : RARCH_DEFAULT_PORT,
+         netplay_is_client ? (!netplay_client_deferred ? server 
+            : server_address_deferred) : NULL,
+         netplay_is_client ? (!netplay_client_deferred ? port   
+            : server_port_deferred   ) : (port != 0 ? port : RARCH_DEFAULT_PORT),
          settings->netplay.stateless_mode, settings->netplay.check_frames, &cbs,
          settings->netplay.nat_traversal, settings->username,
          quirks);