diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6a01baf35..0b3e3ee66 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -645,6 +645,12 @@ on property:sys.powerctl=*
 on property:sys.boot_completed=1
     bootchart stop
 
+on property:sys.boot_completed=1 && property:ro.build.type=user
+    write /proc/sys/kernel/modules_disabled 1
+
+on property:sys.boot_completed=1 && property:ro.build.type=userdebug
+    write /proc/sys/kernel/modules_disabled 1
+
 # system server cannot write to /proc/sys files,
 # and chown/chmod does not work for /proc/sys/ entries.
 # So proxy writes through init.