diff --git a/editions.yaml b/editions.yaml
index ecd0513..8a636ad 100644
--- a/editions.yaml
+++ b/editions.yaml
@@ -15,6 +15,7 @@ splatoon:
   features:
     - prudpv1
     - v3-8-15
+    - splatoon
   settings:
     AUTH_REPORT_VERSION: "branch:origin/project/wup-agmj build:3_8_15_2004_0"
     RNEX_VIRTUAL_PORT_INSECURE: "1:10"
diff --git a/rnex-core/Cargo.toml b/rnex-core/Cargo.toml
index f338fe3..b48999f 100644
--- a/rnex-core/Cargo.toml
+++ b/rnex-core/Cargo.toml
@@ -51,6 +51,7 @@ v3-5-0 = ["v3-4-0"]
 v3-8-15 = ["v3-5-0"]
 v4-3-11 = ["v3-8-15"]
 nx = ["big_pid"]
+splatoon = []
 datastore = ["database-support", "v3-8-15", "dep:aws-sdk-s3", "dep:aws-config"]
 database-support = ["dep:sqlx"]
 
diff --git a/rnex-core/src/nex/matchmake.rs b/rnex-core/src/nex/matchmake.rs
index cb96c91..686f3bb 100644
--- a/rnex-core/src/nex/matchmake.rs
+++ b/rnex-core/src/nex/matchmake.rs
@@ -397,32 +397,35 @@ impl ExtendedMatchmakeSession {
             return Ok(false);
         }
 
-        if search_criteria
-            .attribs
-            .get(0)
-            .map(|str| str.parse().ok())
-            .flatten()
-            != self.session.attributes.get(0).map(|v| *v)
+        #[cfg(feature = "splatoon")]
         {
-            return Ok(false);
-        }
-        if search_criteria
-            .attribs
-            .get(2)
-            .map(|str| str.parse().ok())
-            .flatten()
-            != self.session.attributes.get(2).map(|v| *v)
-        {
-            return Ok(false);
-        }
-        if search_criteria
-            .attribs
-            .get(3)
-            .map(|str| str.parse().ok())
-            .flatten()
-            != self.session.attributes.get(3).map(|v| *v)
-        {
-            return Ok(false);
+            if search_criteria
+                .attribs
+                .get(0)
+                .map(|str| str.parse().ok())
+                .flatten()
+                != self.session.attributes.get(0).map(|v| *v)
+            {
+                return Ok(false);
+            }
+            if search_criteria
+                .attribs
+                .get(2)
+                .map(|str| str.parse().ok())
+                .flatten()
+                != self.session.attributes.get(2).map(|v| *v)
+            {
+                return Ok(false);
+            }
+            if search_criteria
+                .attribs
+                .get(3)
+                .map(|str| str.parse().ok())
+                .flatten()
+                != self.session.attributes.get(3).map(|v| *v)
+            {
+                return Ok(false);
+            }
         }
 
         Ok(true)