diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/PreferenceRepository.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/PreferenceRepository.kt
index ac6fca881..73e22fbd1 100644
--- a/composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/PreferenceRepository.kt
+++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/PreferenceRepository.kt
@@ -126,21 +126,6 @@ class PreferenceRepository(
         }
     }
 
-    fun isDescriptorEnabled(
-        descriptor: Descriptor,
-        isAutoRun: Boolean,
-    ): Flow<Boolean> {
-        val key = getPreferenceKey(
-            name = descriptor.name,
-            prefix = (descriptor.source as? Descriptor.Source.Installed)
-                ?.value?.id?.value?.toString(),
-            autoRun = isAutoRun,
-        )
-        return dataStore.data.map {
-            it[booleanPreferencesKey(key)] == true
-        }.distinctUntilChanged()
-    }
-
     fun isNetTestEnabled(
         descriptor: Descriptor,
         netTest: NetTest,
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetAutoRunSpecification.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetAutoRunSpecification.kt
index 5737d29a6..4cf581fae 100644
--- a/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetAutoRunSpecification.kt
+++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetAutoRunSpecification.kt
@@ -29,7 +29,7 @@ class GetAutoRunSpecification(
     }
 
     private suspend fun List<Descriptor>.filterForAutoRun() =
-        filter { it.enabled && it.isEnabledForAutoRun() }
+        filter { it.enabled }
             .map { descriptor ->
                 descriptor.copy(
                     netTests = descriptor.netTests
@@ -41,14 +41,6 @@ class GetAutoRunSpecification(
             // We only want descriptors with any test left
             .filter { it.netTests.any() || it.longRunningTests.any() }
 
-    private suspend fun Descriptor.isEnabledForAutoRun() =
-        if (name == "experimental") {
-            // Only the experimental descriptor has its own auto-run preference
-            preferenceRepository.isDescriptorEnabled(this, isAutoRun = true).first()
-        } else {
-            true
-        }
-
     private suspend fun Descriptor.isEnabledForAutoRun(netTest: NetTest) =
         preferenceRepository.isNetTestEnabled(this, netTest, isAutoRun = true).first()
 }