From 462b2ea7b27c05f09bcf1b5eb9e186055d42d893 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:27:04 +0300
Subject: [PATCH] Fix sysprompt dependency on instruct

---
 public/script.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/script.js b/public/script.js
index 871d6a40a..81638634c 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3522,6 +3522,9 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
     if (power_user.sysprompt.enabled) {
         system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.sysprompt.content, name1, name2);
         system = isInstruct ? formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.sysprompt.content)) : system;
+    } else {
+        // Nullify if it's not enabled
+        system = '';
     }
 
     // Depth prompt (character-specific A/N)
@@ -3774,7 +3777,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
         personality: personality,
         persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
         scenario: scenario,
-        system: isInstruct ? system : '',
+        system: system,
         char: name2,
         user: name1,
         wiBefore: worldInfoBefore,