diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 45a284bd7..93e9d8b18 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -151,11 +151,12 @@ dependencyGuard {
     configuration("prodReleaseRuntimeClasspath")
 }
 
-tasks.configureEach {
-    if (name == "createProdNonMinifiedReleaseApkListingFileRedirect") {
-        val benchmarksProject = project.rootProject.findProject(":benchmarks")
-        benchmarksProject?.tasks?.matching {
-            it.name.contains("packageProdNonMinifiedRelease")
-        }?.let { dependsOn(it) }
-    }
+val benchmarksProject = rootProject.findProject(":benchmarks")
+if (benchmarksProject != null) {
+    tasks.matching { it.name == "createProdNonMinifiedReleaseApkListingFileRedirect" }
+        .configureEach {
+            dependsOn(benchmarksProject.tasks.matching {
+                it.name.contains("packageProdNonMinifiedRelease")
+            })
+        }
 }
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 67b053ec6..037e8866e 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -26,10 +26,13 @@ android {
     defaultConfig {
         minSdk = 28
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile"
         buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"")
     }
-
+    buildTypes {
+        create("nonMinifiedRelease") {
+            defaultConfig.testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile"
+        }
+    }
     buildFeatures {
         buildConfig = true
     }