diff --git a/Kconfig b/Kconfig
index 836285687f..0e29f6a06b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -559,7 +559,7 @@ menu "Debug Options"
 
 config NDEBUG
 	bool "Define NDEBUG globally"
-	default y
+	default !DEBUG_ASSERTIONS
 
 config DEBUG_ALERT
 	bool
diff --git a/boards/risc-v/mpfs/icicle/configs/network/defconfig b/boards/risc-v/mpfs/icicle/configs/network/defconfig
index f9190878bb..3c2148b48d 100644
--- a/boards/risc-v/mpfs/icicle/configs/network/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/network/defconfig
@@ -6,7 +6,6 @@
 # modifications.
 #
 # CONFIG_DISABLE_OS_API is not set
-# CONFIG_NDEBUG is not set
 # CONFIG_NSH_DISABLE_LOSMART is not set
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="icicle"