diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index c68430235f..3c65b469d3 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -81,7 +81,9 @@
 
 #ifdef HAVE_NETWORKING
 #include "../../network/netplay/netplay.h"
+#ifdef HAVE_NETPLAYDISCOVERY
 #include "../../network/netplay/netplay_discovery.h"
+#endif
 #include "../../wifi/wifi_driver.h"
 #endif
 
@@ -5856,7 +5858,7 @@ static void netplay_refresh_rooms_cb(retro_task_t *task,
          int lan_room_count                   = 0;
          bool refresh                         = false;
 
-#ifndef RARCH_CONSOLE
+#ifdef HAVE_NETPLAYDISCOVERY
          netplay_discovery_driver_ctl(RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES, &lan_hosts);
          if (lan_hosts)
             lan_room_count                    = (int)lan_hosts->size;
diff --git a/retroarch.c b/retroarch.c
index 0e9b86dbbf..a115741e38 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -7883,8 +7883,10 @@ static bool netplay_pre_frame(
 
    if (netplay->is_server && !netplay_use_mitm_server)
    {
+#ifdef HAVE_NETPLAYDISCOVERY
       /* Advertise our server */
       netplay_lan_ad_server(netplay);
+#endif
 
       /* NAT traversal if applicable */
       if (netplay->nat_traversal &&