diff --git a/.env.template b/.env.template
index 1b34abf0639..c464b5c08ea 100644
--- a/.env.template
+++ b/.env.template
@@ -64,7 +64,7 @@ MODELS=`[
       "description": "The latest and biggest model from Meta, fine-tuned for chat.",
       "logoUrl": "https://huggingface.co/datasets/huggingchat/models-logo/resolve/main/meta-logo.png",
       "websiteUrl": "https://ai.meta.com/llama/",
-      "preprompt": " ",
+      "preprompt": "",
       "chatPromptTemplate" : "<s>[INST] <<SYS>>\n{{preprompt}}\n<</SYS>>\n\n{{#each messages}}{{#ifUser}}{{content}} [/INST] {{/ifUser}}{{#ifAssistant}}{{content}} </s><s>[INST] {{/ifAssistant}}{{/each}}",
       "promptExamples": [
         {
diff --git a/package-lock.json b/package-lock.json
index 9ebc03e96c4..6ead39525a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
 				"@huggingface/inference": "^2.6.3",
 				"@iconify-json/bi": "^1.1.21",
 				"@resvg/resvg-js": "^2.6.0",
-				"@xenova/transformers": "^2.6.0",
+				"@xenova/transformers": "^2.16.1",
 				"autoprefixer": "^10.4.14",
 				"browser-image-resizer": "^2.4.1",
 				"date-fns": "^2.29.3",
@@ -73,9 +73,9 @@
 			},
 			"optionalDependencies": {
 				"@anthropic-ai/sdk": "^0.17.1",
+				"@google-cloud/vertexai": "^0.5.0",
 				"aws4fetch": "^1.0.17",
-				"openai": "^4.14.2",
-				"@google-cloud/vertexai": "^0.5.0"
+				"openai": "^4.14.2"
 			}
 		},
 		"node_modules/@alloc/quick-lru": {
@@ -633,6 +633,7 @@
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/@google-cloud/vertexai/-/vertexai-0.5.0.tgz",
 			"integrity": "sha512-qIFHYTXA5UCLdm9JG+Xf1suomCXxRqa1PKdYjqXuhZsCm8mn37Rb0Tf8djlhDzuRVWyWoQTmsWpsk28ZTmbqJg==",
+			"optional": true,
 			"dependencies": {
 				"google-auth-library": "^9.1.0"
 			},
@@ -659,6 +660,14 @@
 				"node": ">=18"
 			}
 		},
+		"node_modules/@huggingface/jinja": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/@huggingface/jinja/-/jinja-0.2.2.tgz",
+			"integrity": "sha512-/KPde26khDUIPkTGU82jdtTW9UAuvUTumCAbFs/7giR0SxsvZC4hru51PBvpijH6BVkHcROcvZM/lpy5h1jRRA==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@humanwhocodes/config-array": {
 			"version": "0.11.8",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -2406,10 +2415,11 @@
 			}
 		},
 		"node_modules/@xenova/transformers": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/@xenova/transformers/-/transformers-2.6.0.tgz",
-			"integrity": "sha512-k9bs+reiwhn+kx0d4FYnlBTWtl8D5Q4fIzoKYxKbTTSVyS33KXbQESRpdIxiU9gtlMKML2Sw0Oep4FYK9dQCsQ==",
+			"version": "2.16.1",
+			"resolved": "https://registry.npmjs.org/@xenova/transformers/-/transformers-2.16.1.tgz",
+			"integrity": "sha512-p2ii7v7oC3Se0PC012dn4vt196GCroaN5ngOYJYkfg0/ce8A5frsrnnnktOBJuejG3bW5Hreb7JZ/KxtUaKd8w==",
 			"dependencies": {
+				"@huggingface/jinja": "^0.2.2",
 				"onnxruntime-web": "1.14.0",
 				"sharp": "^0.32.0"
 			},
@@ -2695,6 +2705,7 @@
 			"version": "9.1.2",
 			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
 			"integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+			"optional": true,
 			"engines": {
 				"node": "*"
 			}
@@ -2832,7 +2843,8 @@
 		"node_modules/buffer-equal-constant-time": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+			"optional": true
 		},
 		"node_modules/bufferutil": {
 			"version": "4.0.7",
@@ -3462,6 +3474,7 @@
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
 			"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+			"optional": true,
 			"dependencies": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -3823,7 +3836,8 @@
 		"node_modules/extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"optional": true
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
@@ -4035,6 +4049,7 @@
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.3.0.tgz",
 			"integrity": "sha512-p+ggrQw3fBwH2F5N/PAI4k/G/y1art5OxKpb2J2chwNNHM4hHuAOtivjPuirMF4KNKwTTUal/lPfL2+7h2mEcg==",
+			"optional": true,
 			"dependencies": {
 				"extend": "^3.0.2",
 				"https-proxy-agent": "^7.0.1",
@@ -4049,6 +4064,7 @@
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
 			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+			"optional": true,
 			"dependencies": {
 				"debug": "^4.3.4"
 			},
@@ -4060,6 +4076,7 @@
 			"version": "7.0.4",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
 			"integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+			"optional": true,
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "4"
@@ -4072,6 +4089,7 @@
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
 			"integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+			"optional": true,
 			"dependencies": {
 				"gaxios": "^6.0.0",
 				"json-bigint": "^1.0.0"
@@ -4188,6 +4206,7 @@
 			"version": "9.7.0",
 			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.7.0.tgz",
 			"integrity": "sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==",
+			"optional": true,
 			"dependencies": {
 				"base64-js": "^1.3.0",
 				"ecdsa-sig-formatter": "^1.0.11",
@@ -4222,6 +4241,7 @@
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
 			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"optional": true,
 			"dependencies": {
 				"gaxios": "^6.0.0",
 				"jws": "^4.0.0"
@@ -4575,6 +4595,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
 			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"devOptional": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -4708,6 +4729,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
 			"integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+			"optional": true,
 			"dependencies": {
 				"bignumber.js": "^9.0.0"
 			}
@@ -4745,6 +4767,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
 			"integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+			"optional": true,
 			"dependencies": {
 				"buffer-equal-constant-time": "1.0.1",
 				"ecdsa-sig-formatter": "1.0.11",
@@ -4755,6 +4778,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
 			"integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+			"optional": true,
 			"dependencies": {
 				"jwa": "^2.0.0",
 				"safe-buffer": "^5.0.1"
@@ -5293,6 +5317,7 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
 			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+			"optional": true,
 			"dependencies": {
 				"whatwg-url": "^5.0.0"
 			},
@@ -5311,17 +5336,20 @@
 		"node_modules/node-fetch/node_modules/tr46": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+			"optional": true
 		},
 		"node_modules/node-fetch/node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+			"optional": true
 		},
 		"node_modules/node-fetch/node_modules/whatwg-url": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
 			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+			"optional": true,
 			"dependencies": {
 				"tr46": "~0.0.3",
 				"webidl-conversions": "^3.0.0"
diff --git a/package.json b/package.json
index ca54a377b13..74869b3145a 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
 		"@huggingface/inference": "^2.6.3",
 		"@iconify-json/bi": "^1.1.21",
 		"@resvg/resvg-js": "^2.6.0",
-		"@xenova/transformers": "^2.6.0",
+		"@xenova/transformers": "^2.16.1",
 		"autoprefixer": "^10.4.14",
 		"browser-image-resizer": "^2.4.1",
 		"date-fns": "^2.29.3",
@@ -83,8 +83,8 @@
 	},
 	"optionalDependencies": {
 		"@anthropic-ai/sdk": "^0.17.1",
+		"@google-cloud/vertexai": "^0.5.0",
 		"aws4fetch": "^1.0.17",
-		"openai": "^4.14.2",
-		"@google-cloud/vertexai": "^0.5.0"
+		"openai": "^4.14.2"
 	}
 }
diff --git a/src/lib/components/TokensCounter.svelte b/src/lib/components/TokensCounter.svelte
index db6e942dfaa..4a7baa27af7 100644
--- a/src/lib/components/TokensCounter.svelte
+++ b/src/lib/components/TokensCounter.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import type { Model } from "$lib/types/Model";
-	import { AutoTokenizer, PreTrainedTokenizer } from "@xenova/transformers";
+	import { getTokenizer } from "$lib/utils/getTokenizer";
+	import type { PreTrainedTokenizer } from "@xenova/transformers";
 
 	export let classNames = "";
 	export let prompt = "";
@@ -9,23 +10,6 @@
 
 	let tokenizer: PreTrainedTokenizer | undefined = undefined;
 
-	async function getTokenizer(_modelTokenizer: Exclude<Model["tokenizer"], undefined>) {
-		if (typeof _modelTokenizer === "string") {
-			// return auto tokenizer
-			return await AutoTokenizer.from_pretrained(_modelTokenizer);
-		}
-		{
-			// construct & return pretrained tokenizer
-			const { tokenizerUrl, tokenizerConfigUrl } = _modelTokenizer satisfies {
-				tokenizerUrl: string;
-				tokenizerConfigUrl: string;
-			};
-			const tokenizerJSON = await (await fetch(tokenizerUrl)).json();
-			const tokenizerConfig = await (await fetch(tokenizerConfigUrl)).json();
-			return new PreTrainedTokenizer(tokenizerJSON, tokenizerConfig);
-		}
-	}
-
 	async function tokenizeText(_prompt: string) {
 		if (!tokenizer) {
 			return;
diff --git a/src/lib/server/embeddingEndpoints/transformersjs/embeddingEndpoints.ts b/src/lib/server/embeddingEndpoints/transformersjs/embeddingEndpoints.ts
index 53424b3f1c0..6e6c47f50bb 100644
--- a/src/lib/server/embeddingEndpoints/transformersjs/embeddingEndpoints.ts
+++ b/src/lib/server/embeddingEndpoints/transformersjs/embeddingEndpoints.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import type { EmbeddingEndpoint } from "../embeddingEndpoints";
-import type { Tensor, Pipeline } from "@xenova/transformers";
+import type { Tensor, FeatureExtractionPipeline } from "@xenova/transformers";
 import { pipeline } from "@xenova/transformers";
 
 export const embeddingEndpointTransformersJSParametersSchema = z.object({
@@ -11,9 +11,9 @@ export const embeddingEndpointTransformersJSParametersSchema = z.object({
 
 // Use the Singleton pattern to enable lazy construction of the pipeline.
 class TransformersJSModelsSingleton {
-	static instances: Array<[string, Promise<Pipeline>]> = [];
+	static instances: Array<[string, Promise<FeatureExtractionPipeline>]> = [];
 
-	static async getInstance(modelName: string): Promise<Pipeline> {
+	static async getInstance(modelName: string): Promise<FeatureExtractionPipeline> {
 		const modelPipelineInstance = this.instances.find(([name]) => name === modelName);
 
 		if (modelPipelineInstance) {
diff --git a/src/lib/server/models.ts b/src/lib/server/models.ts
index 5ec11c3b1b4..8d505f72dc8 100644
--- a/src/lib/server/models.ts
+++ b/src/lib/server/models.ts
@@ -14,7 +14,10 @@ import endpointTgi from "./endpoints/tgi/endpointTgi";
 import { sum } from "$lib/utils/sum";
 import { embeddingModels, validateEmbeddingModelByName } from "./embeddingModels";
 
+import type { PreTrainedTokenizer } from "@xenova/transformers";
+
 import JSON5 from "json5";
+import { getTokenizer } from "$lib/utils/getTokenizer";
 
 type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 
@@ -39,23 +42,9 @@ const modelConfig = z.object({
 		.optional(),
 	datasetName: z.string().min(1).optional(),
 	datasetUrl: z.string().url().optional(),
-	userMessageToken: z.string().default(""),
-	userMessageEndToken: z.string().default(""),
-	assistantMessageToken: z.string().default(""),
-	assistantMessageEndToken: z.string().default(""),
-	messageEndToken: z.string().default(""),
 	preprompt: z.string().default(""),
 	prepromptUrl: z.string().url().optional(),
-	chatPromptTemplate: z
-		.string()
-		.default(
-			"{{preprompt}}" +
-				"{{#each messages}}" +
-				"{{#ifUser}}{{@root.userMessageToken}}{{content}}{{@root.userMessageEndToken}}{{/ifUser}}" +
-				"{{#ifAssistant}}{{@root.assistantMessageToken}}{{content}}{{@root.assistantMessageEndToken}}{{/ifAssistant}}" +
-				"{{/each}}" +
-				"{{assistantMessageToken}}"
-		),
+	chatPromptTemplate: z.string().optional(),
 	promptExamples: z
 		.array(
 			z.object({
@@ -84,11 +73,64 @@ const modelConfig = z.object({
 
 const modelsRaw = z.array(modelConfig).parse(JSON5.parse(MODELS));
 
+async function getChatPromptRender(
+	m: z.infer<typeof modelConfig>
+): Promise<ReturnType<typeof compileTemplate<ChatTemplateInput>>> {
+	if (m.chatPromptTemplate) {
+		return compileTemplate<ChatTemplateInput>(m.chatPromptTemplate, m);
+	}
+	let tokenizer: PreTrainedTokenizer;
+
+	if (!m.tokenizer) {
+		throw new Error(
+			"No tokenizer specified and no chat prompt template specified for model " + m.name
+		);
+	}
+
+	try {
+		tokenizer = await getTokenizer(m.tokenizer);
+	} catch (e) {
+		throw Error(
+			"Failed to load tokenizer for model " +
+				m.name +
+				" consider setting chatPromptTemplate manually or making sure the model is available on the hub."
+		);
+	}
+
+	const renderTemplate = ({ messages, preprompt }: ChatTemplateInput) => {
+		let formattedMessages: { role: string; content: string }[] = messages.map((message) => ({
+			content: message.content,
+			role: message.from,
+		}));
+
+		if (preprompt) {
+			formattedMessages = [
+				{
+					role: "system",
+					content: preprompt,
+				},
+				...formattedMessages,
+			];
+		}
+
+		const output = tokenizer.apply_chat_template(formattedMessages, {
+			tokenize: false,
+			add_generation_prompt: true,
+		});
+
+		if (typeof output !== "string") {
+			throw new Error("Failed to apply chat template, the output is not a string");
+		}
+
+		return output;
+	};
+
+	return renderTemplate;
+}
+
 const processModel = async (m: z.infer<typeof modelConfig>) => ({
 	...m,
-	userMessageEndToken: m?.userMessageEndToken || m?.messageEndToken,
-	assistantMessageEndToken: m?.assistantMessageEndToken || m?.messageEndToken,
-	chatPromptRender: compileTemplate<ChatTemplateInput>(m.chatPromptTemplate, m),
+	chatPromptRender: await getChatPromptRender(m),
 	id: m.id || m.name,
 	displayName: m.displayName || m.name,
 	preprompt: m.prepromptUrl ? await fetch(m.prepromptUrl).then((r) => r.text()) : m.preprompt,
diff --git a/src/lib/types/Template.ts b/src/lib/types/Template.ts
index 662b41a9fea..9fb2fd36e33 100644
--- a/src/lib/types/Template.ts
+++ b/src/lib/types/Template.ts
@@ -1,13 +1,5 @@
 import type { Message } from "./Message";
 
-export type LegacyParamatersTemplateInput = {
-	preprompt?: string;
-	userMessageToken: string;
-	userMessageEndToken: string;
-	assistantMessageToken: string;
-	assistantMessageEndToken: string;
-};
-
 export type ChatTemplateInput = {
 	messages: Pick<Message, "from" | "content">[];
 	preprompt?: string;
diff --git a/src/lib/utils/getTokenizer.ts b/src/lib/utils/getTokenizer.ts
new file mode 100644
index 00000000000..70032746cb4
--- /dev/null
+++ b/src/lib/utils/getTokenizer.ts
@@ -0,0 +1,18 @@
+import type { Model } from "$lib/types/Model";
+import { AutoTokenizer, PreTrainedTokenizer } from "@xenova/transformers";
+
+export async function getTokenizer(_modelTokenizer: Exclude<Model["tokenizer"], undefined>) {
+	if (typeof _modelTokenizer === "string") {
+		// return auto tokenizer
+		return await AutoTokenizer.from_pretrained(_modelTokenizer);
+	} else {
+		// construct & return pretrained tokenizer
+		const { tokenizerUrl, tokenizerConfigUrl } = _modelTokenizer satisfies {
+			tokenizerUrl: string;
+			tokenizerConfigUrl: string;
+		};
+		const tokenizerJSON = await (await fetch(tokenizerUrl)).json();
+		const tokenizerConfig = await (await fetch(tokenizerConfigUrl)).json();
+		return new PreTrainedTokenizer(tokenizerJSON, tokenizerConfig);
+	}
+}
diff --git a/src/lib/utils/template.ts b/src/lib/utils/template.ts
index 87360c88fe6..72f130a706d 100644
--- a/src/lib/utils/template.ts
+++ b/src/lib/utils/template.ts
@@ -1,5 +1,4 @@
 import type { Message } from "$lib/types/Message";
-import type { LegacyParamatersTemplateInput } from "$lib/types/Template";
 import Handlebars from "handlebars";
 
 Handlebars.registerHelper("ifUser", function (this: Pick<Message, "from" | "content">, options) {
@@ -13,8 +12,8 @@ Handlebars.registerHelper(
 	}
 );
 
-export function compileTemplate<T>(input: string, model: LegacyParamatersTemplateInput) {
-	const template = Handlebars.compile<T & LegacyParamatersTemplateInput>(input, {
+export function compileTemplate<T>(input: string, model: { preprompt: string }) {
+	const template = Handlebars.compile<T>(input, {
 		knownHelpers: { ifUser: true, ifAssistant: true },
 		knownHelpersOnly: true,
 		noEscape: true,