diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 9673027824..76b7864b64 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -182,6 +182,7 @@ check_enabled NETWORKING DISCORD discord 'Networking is' false
 check_enabled NETWORKING MINIUPNPC miniupnpc 'Networking is' false
 check_enabled NETWORKING SSL ssl 'Networking is' false
 check_enabled NETWORKING TRANSLATE OCR 'Networking is' false
+check_enabled NETWORKING HAVE_NETPLAYDISCOVERY 'Netplay discovery' 'Networking is' false
 
 check_enabled NETWORKING NETWORKGAMEPAD 'the networked game pad' 'Networking is' true
 check_enabled MINIUPNPC BUILTINMINIUPNPC 'builtin miniupnpc' 'miniupnpc is' true
diff --git a/retroarch.c b/retroarch.c
index 50ad1fb3e5..1d835f1b22 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2474,7 +2474,6 @@ static bool command_verify(const char *cmd)
    return false;
 }
 
-
 static bool command_network_send(const char *cmd_)
 {
    bool ret            = false;
@@ -2525,6 +2524,7 @@ static bool command_network_send(const char *cmd_)
 }
 #endif
 
+#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) && defined(HAVE_COMMAND)
 static void command_parse_sub_msg(command_t *handle, const char *tok)
 {
    const char *arg = NULL;
@@ -2601,6 +2601,7 @@ static void command_network_poll(command_t *handle)
       command_parse_msg(handle, buf, CMD_NETWORK);
    }
 }
+#endif
 
 static bool command_free(command_t *handle)
 {