diff --git a/modules/logits.py b/modules/logits.py
index 383659e0..5d0d3210 100644
--- a/modules/logits.py
+++ b/modules/logits.py
@@ -55,7 +55,10 @@ def get_next_logits(prompt, state, use_samplers, previous, return_dict=False):
     if is_non_hf_exllamav1 or is_non_hf_llamacpp:
         topk_indices = [i.expand((1, 1)) for i in topk_indices]
 
-    tokens = [shared.tokenizer.decode(i) for i in topk_indices]
+    if hasattr(shared.tokenizer, 'convert_ids_to_tokens'):
+        tokens = [shared.tokenizer.convert_ids_to_tokens(int(i)) for i in topk_indices]
+    else:
+        tokens = [shared.tokenizer.decode(i) for i in topk_indices]
 
     if return_dict:
         output = {}