diff --git a/config/features.gni b/config/features.gni
index dd7b0819b..3f6377376 100644
--- a/config/features.gni
+++ b/config/features.gni
@@ -32,8 +32,8 @@ declare_args() {
   # the commented out logic.
   # Eventually we want this to be:
   #   enable_nacl = !is_ios && !is_android
-  enable_nacl =
-      (is_linux && !is_chromeos && !is_debug && current_cpu == "x64") || is_nacl
+  enable_nacl = (is_linux && !is_chromeos && !is_component_build &&
+                 current_cpu == "x64") || is_nacl
   enable_nacl_untrusted = enable_nacl
   enable_pnacl = enable_nacl_untrusted