diff --git a/samples/net/lwm2m_client/prj_frdm_k64f.conf b/samples/net/lwm2m_client/prj_frdm_k64f.conf
index 24b32eccc9d99..d159f59f06f64 100644
--- a/samples/net/lwm2m_client/prj_frdm_k64f.conf
+++ b/samples/net/lwm2m_client/prj_frdm_k64f.conf
@@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y
 
 CONFIG_NET_SHELL=y
 
-CONFIG_NET_APP=y
 CONFIG_NET_APP_NEED_IPV6=y
 CONFIG_NET_APP_NEED_IPV4=y
-CONFIG_NET_APP_CLIENT=y
 CONFIG_NET_APP_SETTINGS=y
 
 CONFIG_LWM2M=y
diff --git a/samples/net/lwm2m_client/prj_qemu_x86.conf b/samples/net/lwm2m_client/prj_qemu_x86.conf
index 489646bec3e76..84fa4dabb2de6 100644
--- a/samples/net/lwm2m_client/prj_qemu_x86.conf
+++ b/samples/net/lwm2m_client/prj_qemu_x86.conf
@@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y
 
 CONFIG_NET_SHELL=y
 
-CONFIG_NET_APP=y
 CONFIG_NET_APP_NEED_IPV6=y
 CONFIG_NET_APP_NEED_IPV4=y
-CONFIG_NET_APP_CLIENT=y
 CONFIG_NET_APP_SETTINGS=y
 
 CONFIG_LWM2M=y
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index 5d5eb5d21896a..650ac11b76420 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -16,11 +16,6 @@
 #include <net/net_app.h>
 #include <net/lwm2m.h>
 
-#if defined(CONFIG_NET_L2_BT)
-#include <bluetooth/bluetooth.h>
-#include <gatt/ipss.h>
-#endif
-
 #define APP_BANNER "Run LWM2M client"
 
 #if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR)
@@ -282,15 +277,6 @@ void main(void)
 
 	k_sem_init(&quit_lock, 0, UINT_MAX);
 
-#if defined(CONFIG_NET_L2_BT)
-	if (bt_enable(NULL)) {
-		SYS_LOG_ERR("Bluetooth init failed");
-		return;
-	}
-	ipss_init();
-	ipss_advertise();
-#endif
-
 	ret = lwm2m_setup();
 	if (ret < 0) {
 		SYS_LOG_ERR("Cannot setup LWM2M fields (%d)", ret);
diff --git a/subsys/net/lib/lwm2m/Kconfig b/subsys/net/lib/lwm2m/Kconfig
index 55b293b4890b5..0b736cf2e78a1 100644
--- a/subsys/net/lib/lwm2m/Kconfig
+++ b/subsys/net/lib/lwm2m/Kconfig
@@ -8,6 +8,7 @@ menuconfig LWM2M
 	bool "OMA LWM2M protocol stack"
 	default n
 	select ZOAP
+	select NET_APP_CLIENT
 	help
 	  This option adds logic for managing OMA LWM2M data