diff --git a/internal/registry/factory_test.go b/internal/registry/factory_test.go
index b49ed21d56..49f11338a5 100644
--- a/internal/registry/factory_test.go
+++ b/internal/registry/factory_test.go
@@ -492,8 +492,10 @@ func TestNewFactory(t *testing.T) {
 			inputPolicy:      model.InputStrictlyRequired,
 		},
 		"vanilla_tor": {
-			enabledByDefault: true,
-			inputPolicy:      model.InputNone,
+			// The experiment crashes on Android and possibly also iOS. We want to
+			// control whether and when to run it using check-in.
+			//enabledByDefault: false,
+			inputPolicy: model.InputNone,
 		},
 		"web_connectivity": {
 			enabledByDefault: true,
diff --git a/internal/registry/vanillator.go b/internal/registry/vanillator.go
index cd8fae6583..fabf801662 100644
--- a/internal/registry/vanillator.go
+++ b/internal/registry/vanillator.go
@@ -16,8 +16,11 @@ func init() {
 				*config.(*vanillator.Config),
 			)
 		},
-		config:           &vanillator.Config{},
-		enabledByDefault: true,
+		config: &vanillator.Config{},
+		// We discussed this topic with @aanorbel. On Android this experiment crashes
+		// frequently because of https://github.com/ooni/probe/issues/2406. So, it seems
+		// more cautious to disable it by default and let the check-in API decide.
+		enabledByDefault: false,
 		inputPolicy:      model.InputNone,
 	}
 }