diff --git a/app/backend/core/modelhelper.py b/app/backend/core/modelhelper.py
index 970d5ed8a..758d3c7be 100644
--- a/app/backend/core/modelhelper.py
+++ b/app/backend/core/modelhelper.py
@@ -8,12 +8,14 @@
     "gpt-35-turbo-16k": 16385,
     "gpt-3.5-turbo-16k": 16385,
     "gpt-4": 8192,
-    "gpt-4-32k": 32768
+    "gpt-4-32k": 32768,
+    "gpt-4o": 128000
 }
 
 AOAI_2_OAI = {
     "gpt-35-turbo": "gpt-3.5-turbo",
-    "gpt-35-turbo-16k": "gpt-3.5-turbo-16k"
+    "gpt-35-turbo-16k": "gpt-3.5-turbo-16k",
+    "gpt-4o": "gpt-4o"
 }
 
 
diff --git a/app/backend/requirements.txt b/app/backend/requirements.txt
index 4cf360db7..a73e97aba 100644
--- a/app/backend/requirements.txt
+++ b/app/backend/requirements.txt
@@ -8,7 +8,7 @@ openai==1.17.0
 azure-search-documents==11.4.0b11
 azure-storage-blob==12.16.0
 azure-cosmos == 4.3.1
-tiktoken == 0.5.2
+tiktoken == 0.7.0
 fastapi == 0.109.1
 fastapi-utils == 0.2.1
 uvicorn == 0.23.2