diff --git a/Cargo.lock b/Cargo.lock
index b800b9e..be8192a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -247,6 +247,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
+ "wasmtimer",
  "ws_stream_wasm",
 ]
 
@@ -2819,6 +2820,20 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "wasmtimer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.66"
diff --git a/Cargo.toml b/Cargo.toml
index 169bd02..9c6fe21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,6 +75,7 @@ getrandom = { version = "0.2.12" }
 getrandom = { version = "0.2.12", features = ["js"] }
 ws_stream_wasm = "0.7.4"
 wasm-bindgen-futures = "0.4.39"
+wasmtimer = "0.2.0"
 
 [dev-dependencies]
 lazy_static = "1.4.0"
diff --git a/examples/gateway_observers.rs b/examples/gateway_observers.rs
index a13c935..a26ecfb 100644
--- a/examples/gateway_observers.rs
+++ b/examples/gateway_observers.rs
@@ -8,6 +8,11 @@ use chorus::{
 use std::{sync::Arc, time::Duration};
 use tokio::{self};
 
+#[cfg(not(target_arch = "wasm32"))]
+use tokio::time::sleep;
+#[cfg(target_arch = "wasm32")]
+use wasmtimer::tokio::sleep;
+
 // This example creates a simple gateway connection and a basic observer struct
 
 // Due to certain limitations all observers must impl debug
@@ -54,10 +59,9 @@ async fn main() {
     let mut identify = GatewayIdentifyPayload::common();
     identify.token = token;
     gateway.send_identify(identify).await;
-    safina_timer::start_timer_thread();
 
     // Do something on the main thread so we don't quit
     loop {
-        safina_timer::sleep_for(Duration::MAX).await
+        sleep(Duration::from_secs(3600)).await;
     }
 }
diff --git a/examples/gateway_simple.rs b/examples/gateway_simple.rs
index 2996283..7a0d807 100644
--- a/examples/gateway_simple.rs
+++ b/examples/gateway_simple.rs
@@ -3,6 +3,11 @@ use std::time::Duration;
 use chorus::gateway::Gateway;
 use chorus::{self, types::GatewayIdentifyPayload};
 
+#[cfg(not(target_arch = "wasm32"))]
+use tokio::time::sleep;
+#[cfg(target_arch = "wasm32")]
+use wasmtimer::tokio::sleep;
+
 /// This example creates a simple gateway connection and a session with an Identify event
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
@@ -10,7 +15,7 @@ async fn main() {
     let websocket_url_spacebar = "wss://gateway.old.server.spacebar.chat/".to_string();
 
     // Initiate the gateway connection, starting a listener in one thread and a heartbeat handler in another
-    let _ = Gateway::spawn(websocket_url_spacebar).await.unwrap();
+    let gateway = Gateway::spawn(websocket_url_spacebar).await.unwrap();
 
     // At this point, we are connected to the server and are sending heartbeats, however we still haven't authenticated
 
@@ -26,10 +31,10 @@ async fn main() {
     identify.token = token;
 
     // Send off the event
-    safina_timer::start_timer_thread();
+    gateway.send_identify(identify).await;
 
     // Do something on the main thread so we don't quit
     loop {
-        safina_timer::sleep_for(Duration::MAX).await
+        sleep(Duration::from_secs(3600)).await;
     }
 }
diff --git a/src/gateway/heartbeat.rs b/src/gateway/heartbeat.rs
index da70e22..668015b 100644
--- a/src/gateway/heartbeat.rs
+++ b/src/gateway/heartbeat.rs
@@ -1,9 +1,20 @@
 use futures_util::SinkExt;
 use log::*;
-use std::time::{self, Duration, Instant};
+
+#[cfg(not(target_arch = "wasm32"))]
+use tokio::time::Instant;
+#[cfg(target_arch = "wasm32")]
+use wasmtimer::std::Instant;
+
+#[cfg(not(target_arch = "wasm32"))]
+use tokio::time::sleep_until;
+#[cfg(target_arch = "wasm32")]
+use wasmtimer::tokio::sleep_until;
+
+use std::time::Duration;
+
 use tokio::sync::mpsc::{Receiver, Sender};
 
-use safina_timer::sleep_until;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::task;
 
@@ -57,12 +68,10 @@ impl HeartbeatHandler {
         mut receive: Receiver<HeartbeatThreadCommunication>,
         mut kill_receive: tokio::sync::broadcast::Receiver<()>,
     ) {
-        let mut last_heartbeat_timestamp: Instant = time::Instant::now();
+        let mut last_heartbeat_timestamp: Instant = Instant::now();
         let mut last_heartbeat_acknowledged = true;
         let mut last_seq_number: Option<u64> = None;
 
-        safina_timer::start_timer_thread();
-
         loop {
             if kill_receive.try_recv().is_ok() {
                 trace!("GW: Closing heartbeat task");
@@ -123,7 +132,7 @@ impl HeartbeatHandler {
                     break;
                 }
 
-                last_heartbeat_timestamp = time::Instant::now();
+                last_heartbeat_timestamp = Instant::now();
                 last_heartbeat_acknowledged = false;
             }
         }