diff --git a/.buildkite/scripts/steps/firebase_deploy.ts b/.buildkite/scripts/steps/firebase_deploy.ts
index b070628789..0c57270c74 100644
--- a/.buildkite/scripts/steps/firebase_deploy.ts
+++ b/.buildkite/scripts/steps/firebase_deploy.ts
@@ -62,11 +62,9 @@ void (async () => {
     dest: path.join(outDir, 'a11y-report'),
   });
 
-  const chartsPackage = await getChartsPackageMetadata(true);
-  const { liveTarballDest, commitTarballDest, manifestDest, indexDest } = await prepareChartsPackagesForDeployment(
-    outDir,
-    chartsPackage,
-  );
+  const chartsPackage = bkEnv.isPullRequest ? await getChartsPackageMetadata(true) : null;
+  const chartsPackagePaths =
+    chartsPackage !== null ? await prepareChartsPackagesForDeployment(outDir, chartsPackage) : null;
 
   startGroup('Check deployment files');
 
@@ -75,20 +73,20 @@ void (async () => {
   const hasE2EIndex = fs.existsSync(path.join(outDir, 'e2e/index.html'));
   const hasVrtReportIndex = fs.existsSync(path.join(outDir, 'vrt-report/index.html'));
   const hasA11yReportIndex = fs.existsSync(path.join(outDir, 'a11y-report/index.html'));
-  const hasLiveChartsPackage = fs.existsSync(liveTarballDest);
-  const hasCommitChartsPackage = fs.existsSync(commitTarballDest);
-  const hasChartsPackageManifest = fs.existsSync(manifestDest);
-  const hasChartsPackageIndex = fs.existsSync(indexDest);
   const missingFiles = [
     ['docs', hasDocsIndex],
     ['storybook', hasStorybookIndex],
     ['e2e server', hasE2EIndex],
     ['vrt report', hasVrtReportIndex],
     ['a11y report', hasA11yReportIndex],
-    ['live charts package tarball', hasLiveChartsPackage],
-    ['commit charts package tarball', hasCommitChartsPackage],
-    ['charts package manifest', hasChartsPackageManifest],
-    ['charts package index', hasChartsPackageIndex],
+    ...(chartsPackagePaths
+      ? ([
+          ['live charts package tarball', fs.existsSync(chartsPackagePaths.liveTarballDest)],
+          ['commit charts package tarball', fs.existsSync(chartsPackagePaths.commitTarballDest)],
+          ['charts package manifest', fs.existsSync(chartsPackagePaths.manifestDest)],
+          ['charts package index', fs.existsSync(chartsPackagePaths.indexDest)],
+        ] as const)
+      : []),
   ]
     .filter(([, exists]) => !exists)
     .map<string>(([f]) => f as string);
diff --git a/.buildkite/scripts/steps/firebase_pre_deploy.ts b/.buildkite/scripts/steps/firebase_pre_deploy.ts
index bdc5e07c39..a5fa932c7d 100644
--- a/.buildkite/scripts/steps/firebase_pre_deploy.ts
+++ b/.buildkite/scripts/steps/firebase_pre_deploy.ts
@@ -53,30 +53,27 @@ void (async () => {
     dest: path.join(outDir, 'e2e'),
   });
 
-  // Serve the packaged tarball from the preview site so downstream PRs can install it.
-  const chartsPackage = await getChartsPackageMetadata(true);
-  const { liveTarballDest, commitTarballDest, manifestDest, indexDest } = await prepareChartsPackagesForDeployment(
-    outDir,
-    chartsPackage,
-  );
+  const chartsPackage = bkEnv.isPullRequest ? await getChartsPackageMetadata(true) : null;
+  const chartsPackagePaths =
+    chartsPackage !== null ? await prepareChartsPackagesForDeployment(outDir, chartsPackage) : null;
 
   startGroup('Check deployment files');
 
   const hasDocsIndex = fs.existsSync('./e2e_server/public/index.html');
   const hasStorybookIndex = fs.existsSync('./e2e_server/public/storybook/index.html');
   const hasE2EIndex = fs.existsSync('./e2e_server/public/e2e/index.html');
-  const hasLiveChartsPackage = fs.existsSync(liveTarballDest);
-  const hasCommitChartsPackage = fs.existsSync(commitTarballDest);
-  const hasChartsPackageManifest = fs.existsSync(manifestDest);
-  const hasChartsPackageIndex = fs.existsSync(indexDest);
   const missingFiles = [
     ['docs', hasDocsIndex],
     ['storybook', hasStorybookIndex],
     ['e2e server', hasE2EIndex],
-    ['live charts package tarball', hasLiveChartsPackage],
-    ['commit charts package tarball', hasCommitChartsPackage],
-    ['charts package manifest', hasChartsPackageManifest],
-    ['charts package index', hasChartsPackageIndex],
+    ...(chartsPackagePaths
+      ? ([
+          ['live charts package tarball', fs.existsSync(chartsPackagePaths.liveTarballDest)],
+          ['commit charts package tarball', fs.existsSync(chartsPackagePaths.commitTarballDest)],
+          ['charts package manifest', fs.existsSync(chartsPackagePaths.manifestDest)],
+          ['charts package index', fs.existsSync(chartsPackagePaths.indexDest)],
+        ] as const)
+      : []),
   ]
     .filter(([, exists]) => !exists)
     .map<string>(([f]) => f as string);