diff --git a/server/src/client_api.rs b/server/src/client_api.rs
index a0b43ba4..7d0dc063 100644
--- a/server/src/client_api.rs
+++ b/server/src/client_api.rs
@@ -55,7 +55,7 @@ pub async fn stream_features(
     )
     .await;
     match (req.app_data::<Data<FeatureRefresher>>(), features) {
-        (Some(refresher), Ok(features)) => refresher.broadcaster.new_client().await,
+        (Some(refresher), Ok(features)) => refresher.broadcaster.new_client(features).await,
         _ => todo!(),
     }
 }
diff --git a/server/src/http/broadcaster.rs b/server/src/http/broadcaster.rs
index 5a5c1196..12989d0a 100644
--- a/server/src/http/broadcaster.rs
+++ b/server/src/http/broadcaster.rs
@@ -1,6 +1,6 @@
 use std::{sync::Arc, time::Duration};
 
-use actix_web::rt::time::interval;
+use actix_web::{rt::time::interval, web::Json};
 use actix_web_lab::{
     sse::{self, Event, Sse},
     util::InfallibleStream,
@@ -9,6 +9,7 @@ use futures_util::future;
 use parking_lot::Mutex;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
+use unleash_types::client_features::ClientFeatures;
 
 pub struct Broadcaster {
     inner: Mutex<BroadcasterInner>,
@@ -65,12 +66,20 @@ impl Broadcaster {
 
     /// Registers client with broadcaster, returning an SSE response body.
     /// should take the current feature set as input and send it to the client.
-    pub async fn new_client(&self) -> Sse<InfallibleStream<ReceiverStream<sse::Event>>> {
+    pub async fn new_client(
+        &self,
+        features: Json<ClientFeatures>,
+    ) -> Sse<InfallibleStream<ReceiverStream<sse::Event>>> {
         let (tx, rx) = mpsc::channel(10);
 
-        tx.send(sse::Data::new("").event("unleash-connected").into())
-            .await
-            .unwrap();
+        tx.send(
+            sse::Data::new_json(features)
+                .unwrap()
+                .event("unleash-connected")
+                .into(),
+        )
+        .await
+        .unwrap();
 
         self.inner.lock().clients.push(tx);
 
diff --git a/server/src/http/feature_refresher.rs b/server/src/http/feature_refresher.rs
index 503b6b9e..a31fe0df 100644
--- a/server/src/http/feature_refresher.rs
+++ b/server/src/http/feature_refresher.rs
@@ -369,7 +369,7 @@ impl FeatureRefresher {
                                     serde_json::from_str(&event.data).unwrap();
                                     refresher.handle_client_features_updated(TokenRefresh::new(token, None), features);
 
-                                    let data = Data::new_json(event.data).unwrap().event("unleash-updated");
+                                    let data = Data::new(event.data).event("unleash-updated");
                                     broadcaster.rebroadcast(actix_web_lab::sse::Event::Data(data)).await;
                                     // self.broadcaster.broadcast("got an update".clone).await;
                                 }