diff --git a/device.mk b/device.mk
index 2ae775a9..5eac8c8d 100644
--- a/device.mk
+++ b/device.mk
@@ -215,8 +215,10 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
 # This will be updated to 31 (Android S) for shipping
 PRODUCT_SHIPPING_API_LEVEL := 30
 
-# Temporarily disable the debugfs restriction on 31 (Android S)
-PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
+# Enable the debugfs restriction before upgrading shipping abi level to 31 (Android S)
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_SET_DEBUGFS_RESTRICTIONS := true
+endif
 
 # Enforce the Product interface
 PRODUCT_PRODUCT_VNDK_VERSION := current