diff --git a/configs/genoa.common b/configs/genoa.common
index 3e862d5231f5..85f8a938af11 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -97,8 +97,17 @@ ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 CONFIG_PKTLOG_HAS_SPECIFIC_DATA := y
 endif
 
-PANIC_ON_BUG := y
-WLAN_WARN_ON_ASSERT := y
+ifeq ($(CONFIG_SLUB_DEBUG), y)
+        PANIC_ON_BUG := y
+        WLAN_WARN_ON_ASSERT := y
+else ifeq ($(CONFIG_PERF_DEBUG), y)
+        PANIC_ON_BUG := y
+        WLAN_WARN_ON_ASSERT := y
+else
+        PANIC_ON_BUG := n
+        WLAN_WARN_ON_ASSERT := n
+endif
+
 CONFIG_WLAN_LOGGING_SOCK_SVC := y
 
 #Flag to enable wbuff feature