diff --git a/rnex-core/src/nex/user.rs b/rnex-core/src/nex/user.rs
index 7b56fdf..7f0bf41 100644
--- a/rnex-core/src/nex/user.rs
+++ b/rnex-core/src/nex/user.rs
@@ -52,6 +52,8 @@ use rnex_core::rmc::structures::ranking::UploadCompetitionData;
 use std::sync::{Arc, Weak};
 use tokio::sync::{Mutex, RwLock};
 
+use crate::rmc::structures::Error;
+
 cfg_if! {
     if #[cfg(feature = "datastore")] {
         use rnex_core::rmc::protocols::datastore::{DataStore, RawDataStore, RawDataStoreInfo, RemoteDataStore};
@@ -509,6 +511,15 @@ impl MatchmakeExtension for User {
 }
 
 impl Matchmake for User {
+    async fn find_by_single_id(&self, gid: u32) -> Result<(bool, Any), ErrorCode> {
+        let s = self.matchmake_manager.get_session(gid).await?;
+        let s = s.lock().await;
+        Ok((
+            true,
+            Any::new(&s.session).map_err(|_| ErrorCode::Custom_Unknown)?,
+        ))
+    }
+
     async fn unregister_gathering(&self, _gid: u32) -> Result<bool, ErrorCode> {
         Ok(true)
     }
diff --git a/rnex-core/src/rmc/protocols/matchmake.rs b/rnex-core/src/rmc/protocols/matchmake.rs
index 94edce3..d1c43b9 100644
--- a/rnex-core/src/rmc/protocols/matchmake.rs
+++ b/rnex-core/src/rmc/protocols/matchmake.rs
@@ -4,10 +4,14 @@ use rnex_core::rmc::response::ErrorCode;
 
 use rnex_core::PID;
 
+use crate::rmc::structures::any::Any;
+
 #[rmc_proto(21)]
 pub trait Matchmake {
     #[method_id(2)]
     async fn unregister_gathering(&self, gid: u32) -> Result<bool, ErrorCode>;
+    #[method_id(21)]
+    async fn find_by_single_id(&self, gid: u32) -> Result<(bool, Any), ErrorCode>;
     #[method_id(41)]
     async fn get_session_urls(&self, gid: u32) -> Result<Vec<StationUrl>, ErrorCode>;
     #[method_id(42)]