diff --git a/public/context/NovelAI.json b/public/context/NovelAI.json
new file mode 100644
index 000000000..b22590ab0
--- /dev/null
+++ b/public/context/NovelAI.json
@@ -0,0 +1,6 @@
+{
+    "name": "NovelAI",
+    "story_string": "{{#if system}}{{system}}{{/if}}\n{{#if wiBefore}}{{wiBefore}}{{/if}}\n{{#if persona}}{{persona}}{{/if}}\n{{#if description}}{{description}}{{/if}}\n{{#if personality}}Personality: {{personality}}{{/if}}\n{{#if scenario}}Scenario: {{scenario}}{{/if}}\n{{#if wiAfter}}{{wiAfter}}{{/if}}",
+    "chat_start": "***",
+    "example_separator": "***"
+}
\ No newline at end of file
diff --git a/public/script.js b/public/script.js
index dbfb1a3dd..2deb37bb0 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3332,11 +3332,11 @@ function addChatsPreamble(mesSendString) {
 }
 
 function addChatsSeparator(mesSendString) {
-    if (main_api === 'novel') {
-        return '***\n' + mesSendString;
-    }
+    // if (main_api === 'novel') {
+    //     return '***\n' + mesSendString;
+    // }
 
-    else if (power_user.context.chat_start) {
+    if (power_user.context.chat_start) {
         return power_user.context.chat_start + '\n' + mesSendString;
     }
 
diff --git a/server.js b/server.js
index 60fdae7ce..b46880ccb 100644
--- a/server.js
+++ b/server.js
@@ -1920,7 +1920,7 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
             "stop_sequences": request.body.stop_sequences,
             "bad_words_ids": badWordsList,
             "logit_bias_exp": logit_bias_exp,
-            //generate_until_sentence = true;
+            "generate_until_sentence": request.body.generate_until_sentence,
             "use_cache": request.body.use_cache,
             "use_string": true,
             "return_full_text": request.body.return_full_text,