diff --git a/Cargo.lock b/Cargo.lock
index d61fe45cf8..1b1758dd8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9257,7 +9257,7 @@ dependencies = [
 [[package]]
 name = "tiktoken-rs"
 version = "0.5.6"
-source = "git+https://github.com/JosephTLyons/tiktoken-rs/?rev=edb3ea9eda1b906205b346599c43c5c0e8da1392#edb3ea9eda1b906205b346599c43c5c0e8da1392"
+source = "git+https://github.com/zurawiki/tiktoken-rs?rev=6fd80d41d5c31e256cd760b52cd0257586033eb2#6fd80d41d5c31e256cd760b52cd0257586033eb2"
 dependencies = [
  "anyhow",
  "base64 0.21.4",
diff --git a/Cargo.toml b/Cargo.toml
index 2e43fa45d0..a04a6d10b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -160,9 +160,7 @@ pretty_assertions = "1.3.0"
 git2 = { version = "0.15", default-features = false}
 uuid = { version = "1.1.2", features = ["v4"] }
 
-# Point back to original crate when this is merged:
-# https://github.com/zurawiki/tiktoken-rs/pull/49
-tiktoken-rs = { git = "https://github.com/JosephTLyons/tiktoken-rs/", rev="edb3ea9eda1b906205b346599c43c5c0e8da1392" }
+tiktoken-rs = { git = "https://github.com/zurawiki/tiktoken-rs", rev="6fd80d41d5c31e256cd760b52cd0257586033eb2" }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }