diff --git a/pkg/chains/solana/proto_helpers.go b/pkg/chains/solana/proto_helpers.go
index 10a392c634..b3acdf5ed4 100644
--- a/pkg/chains/solana/proto_helpers.go
+++ b/pkg/chains/solana/proto_helpers.go
@@ -1419,7 +1419,7 @@ func ConvertValueComparatorsToProto(comparators []solprimitives.IndexedValueComp
 		return nil
 	}
 
-	out := make([]*IndexedValueComparator, len(comparators))
+	out := make([]*IndexedValueComparator, 0, len(comparators))
 	for _, c := range comparators {
 		out = append(out, &IndexedValueComparator{
 			Value:    c.Value,
@@ -1427,7 +1427,7 @@ func ConvertValueComparatorsToProto(comparators []solprimitives.IndexedValueComp
 		})
 	}
 
-	return nil
+	return out
 }
 
 func ConvertValueCompraratorsFromProto(comparators []*IndexedValueComparator) []solprimitives.IndexedValueComparator {
diff --git a/pkg/chains/solana/proto_helpers_test.go b/pkg/chains/solana/proto_helpers_test.go
index 22a4e42c16..30d7d4acb7 100644
--- a/pkg/chains/solana/proto_helpers_test.go
+++ b/pkg/chains/solana/proto_helpers_test.go
@@ -291,17 +291,17 @@ func TestExpressions_Roundtrip_SolanaPrimitives(t *testing.T) {
 		{Value: typesolana.IndexedValue{1, 2, 3}, Operator: 0},
 	})
 
-	root := query.Or(query.And(a, e), evBy)
-
+	expressions := []query.Expression{a, e, evBy}
 	// to proto
-	pb, err := conv.ConvertExpressionsToProto([]query.Expression{root})
+	pb, err := conv.ConvertExpressionsToProto(expressions)
 	require.NoError(t, err)
-	require.Len(t, pb, 1)
+	require.Len(t, pb, 3)
 
 	// from proto
 	round, err := conv.ConvertExpressionsFromProto(pb)
 	require.NoError(t, err)
-	require.Len(t, round, 1)
+	require.Len(t, round, 3)
+	require.Equal(t, expressions, round)
 }
 
 func TestLPFilterAndSubkeysConverters(t *testing.T) {
diff --git a/pkg/settings/cresettings/defaults.json b/pkg/settings/cresettings/defaults.json
index d6b2ae90e7..64f6561851 100644
--- a/pkg/settings/cresettings/defaults.json
+++ b/pkg/settings/cresettings/defaults.json
@@ -38,6 +38,7 @@
 		"ChainAllowed": {
 			"Default": "false",
 			"Values": {
+				"12463857294658392847": "true",
 				"12922642891491394802": "true",
 				"3379446385462418246": "true"
 			}
diff --git a/pkg/settings/cresettings/defaults.toml b/pkg/settings/cresettings/defaults.toml
index ac1f2a5cc9..7bd7473a60 100644
--- a/pkg/settings/cresettings/defaults.toml
+++ b/pkg/settings/cresettings/defaults.toml
@@ -40,6 +40,7 @@ LogEventLimit = '1000'
 Default = 'false'
 
 [PerWorkflow.ChainAllowed.Values]
+12463857294658392847 = 'true'
 12922642891491394802 = 'true'
 3379446385462418246 = 'true'
 
diff --git a/pkg/settings/cresettings/settings.go b/pkg/settings/cresettings/settings.go
index 56e8bba0ea..c5281922a4 100644
--- a/pkg/settings/cresettings/settings.go
+++ b/pkg/settings/cresettings/settings.go
@@ -100,10 +100,12 @@ var Default = Schema{
 		LogLineLimit:                  Size(config.KByte),
 		LogEventLimit:                 Int(1_000),
 		ChainAllowed: PerChainSelector(Bool(false), map[string]bool{
-			// geth-testnet
-			"3379446385462418246": true,
 			// geth-devnet2
 			"12922642891491394802": true,
+			// geth-testnet
+			"3379446385462418246": true,
+			// solana-testnet
+			"12463857294658392847": true,
 		}),
 
 		CRONTrigger: cronTrigger{