diff --git a/build.gradle b/build.gradle
index 2f800478a3b..8fb55ffdd9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ subprojects {
 }
 
 task bundlePack(type: Zip) {
-  onlyIf { project('kibana').bundlePlugin.enabled }
+  onlyIf { project('kibana').bundlePlugin.enabled && project('cpp').strip.enabled }
   dependsOn 'elasticsearch:bundlePlugin'
   dependsOn 'kibana:bundlePlugin'
   from { zipTree(project('elasticsearch').bundlePlugin.outputs.files.singleFile) }
diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle
index d4467c919e2..ffb430c524b 100644
--- a/elasticsearch/build.gradle
+++ b/elasticsearch/build.gradle
@@ -49,3 +49,5 @@ bundlePlugin {
     includeEmptyDirs = false
   }
 }
+
+bundlePlugin.dependsOn(':cpp:strip')