diff --git a/bin/server.js b/bin/server.js
index 86e24904..d7402045 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -105,43 +105,46 @@ server.post('/conversation', async (request, reply) => {
 
         const messageClient = getClient(clientToUseForMessage);
         const {
-            context,
-            shouldGenerateTitle,
+            accountType,
             clientId,
+            context,
             conversationSignature,
             imageBase64,
             imageURL,
             invocationId,
             jailbreakConversationId,
-            toneStyle,
-            systemMessage,
+            persona,
+            plugins,
+            shouldGenerateTitle,
             showSuggestions,
+            systemMessage,
+            toneStyle,
             useBase64,
             useUserSuffixMessage,
-            plugins,
-            persona,
-            accountType,
         } = body;
         const messageOptions = {
             conversationId: body.conversationId ? body.conversationId.toString() : undefined,
             parentMessageId: body.parentMessageId ? body.parentMessageId.toString() : undefined,
             clientOptions,
-            ...(clientToUseForMessage === 'chatgpt' && { context }),
+            ...(clientToUseForMessage === 'chatgpt'
+                || clientToUseForMessage === 'bing' ? { context } : {}),
             ...(clientToUseForMessage === 'chatgpt' && { shouldGenerateTitle }),
-            ...(clientToUseForMessage === 'bing' && { clientId }),
-            ...(clientToUseForMessage === 'bing' && { conversationSignature }),
-            ...(clientToUseForMessage === 'bing' && { imageBase64 }),
-            ...(clientToUseForMessage === 'bing' && { imageURL }),
-            ...(clientToUseForMessage === 'bing' && { invocationId }),
-            ...(clientToUseForMessage === 'bing' && { jailbreakConversationId }),
-            ...(clientToUseForMessage === 'bing' && { toneStyle }),
-            ...(clientToUseForMessage === 'bing' && { systemMessage }),
-            ...(clientToUseForMessage === 'bing' && { showSuggestions }),
-            ...(clientToUseForMessage === 'bing' && { useBase64 }),
-            ...(clientToUseForMessage === 'bing' && { useUserSuffixMessage }),
-            ...(clientToUseForMessage === 'bing' && { plugins }),
-            ...(clientToUseForMessage === 'bing' && { persona }),
-            ...(clientToUseForMessage === 'bing' && { accountType }),
+            ...(clientToUseForMessage === 'bing' ? {
+                accountType,
+                clientId,
+                conversationSignature,
+                imageBase64,
+                imageURL,
+                invocationId,
+                jailbreakConversationId,
+                persona,
+                plugins,
+                showSuggestions,
+                systemMessage,
+                toneStyle,
+                useBase64,
+                useUserSuffixMessage,
+            } : {}),
             onProgress,
             abortController,
         };