diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
index f4bc4ac86d8b..5fa9225c98bc 100644
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -34,7 +34,5 @@ nooptions       INVARIANTS
 nooptions       INVARIANT_SUPPORT
 nooptions       WITNESS
 nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
 nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
 
diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
index 1d7d22d322ce..d3ae3d0f071f 100644
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -34,7 +34,5 @@ nooptions       INVARIANTS
 nooptions       INVARIANT_SUPPORT
 nooptions       WITNESS
 nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
 nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
 nooptions       USB_DEBUG