diff --git a/services/tunnelbroker/src/websockets/session.rs b/services/tunnelbroker/src/websockets/session.rs
--- a/services/tunnelbroker/src/websockets/session.rs
+++ b/services/tunnelbroker/src/websockets/session.rs
@@ -293,6 +293,18 @@
           )
           .await?;
       }
+      MessageToTunnelbroker::SetDeviceTokenWithPlatform(
+        token_with_platform,
+      ) => {
+        self
+          .db_client
+          .set_device_token(
+            &self.device_info.device_id,
+            &token_with_platform.device_token,
+            Some(token_with_platform.platform.clone()),
+          )
+          .await?;
+      }
     }
 
     Ok(())
diff --git a/shared/tunnelbroker_messages/src/messages/mod.rs b/shared/tunnelbroker_messages/src/messages/mod.rs
--- a/shared/tunnelbroker_messages/src/messages/mod.rs
+++ b/shared/tunnelbroker_messages/src/messages/mod.rs
@@ -78,5 +78,6 @@
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(untagged)]
 pub enum MessageToTunnelbroker {
+  SetDeviceTokenWithPlatform(SetDeviceTokenWithPlatform),
   SetDeviceToken(SetDeviceToken),
 }