diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c
index dc277c8b93..f8400e5d89 100644
--- a/network/netplay/netplay_handshake.c
+++ b/network/netplay/netplay_handshake.c
@@ -21,6 +21,7 @@
 
 #include <boolean.h>
 #include <compat/strl.h>
+#include <string/stdstring.h>
 #include <rhash.h>
 #include <retro_timers.h>
 
@@ -279,7 +280,8 @@ static void handshake_password(void *ignore, const char *line)
    struct netplay_connection *connection = &netplay->connections[0];
 
    snprintf(password, sizeof(password), "%08X", connection->salt);
-   strlcpy(password + 8, line, sizeof(password)-8);
+   if (!string_is_empty(line))
+      strlcpy(password + 8, line, sizeof(password)-8);
 
    password_buf.cmd[0] = htonl(NETPLAY_CMD_PASSWORD);
    password_buf.cmd[1] = htonl(sizeof(password_buf.password));