diff --git a/src/interface/emacs/khoj.el b/src/interface/emacs/khoj.el
index 70d50b16..8af83ed0 100644
--- a/src/interface/emacs/khoj.el
+++ b/src/interface/emacs/khoj.el
@@ -231,6 +231,11 @@ for example), set this to the full interpreter path."
   :type 'string
   :group 'khoj)
 
+(defcustom khoj-chat-offline nil
+  "Use offline model to chat with khoj."
+  :type 'boolean
+  :group 'khoj)
+
 (defcustom khoj-auto-setup t
   "Automate install, configure and start of khoj server.
 Auto invokes setup steps on calling main entrypoint."
@@ -375,6 +380,7 @@ CONFIG is json obtained from Khoj config API."
          (default-chat-dir (khoj--get-directory-from-config default-config '(processor conversation conversation-logfile)))
          (chat-model (or khoj-chat-model (alist-get 'chat-model (alist-get 'openai (alist-get 'conversation (alist-get 'processor default-config))))))
          (default-model (alist-get 'model (alist-get 'conversation (alist-get 'processor default-config))))
+         (enable-offline-chat (or khoj-chat-offline (alist-get 'enable-offline-chat (alist-get 'conversation (alist-get 'processor default-config)))))
          (config (or current-config default-config)))
 
     ;; Configure content types
@@ -428,40 +434,44 @@ CONFIG is json obtained from Khoj config API."
              (openai (assoc 'openai conversation)))
         (when openai
           ;; Unset the `openai' field in the khoj conversation processor config
-          (message "khoj.el: disable Khoj Chat using OpenAI as your OpenAI API key got removed from config")
+          (message "khoj.el: Disable Chat using OpenAI as your OpenAI API key got removed from config")
           (setcdr conversation (delq openai (cdr conversation)))
-          (setcdr processor (delq conversation (cdr processor)))
-          (setq config (delq processor config))
           (push conversation (cdr processor))
           (push processor config))))
 
+     ;; If khoj backend isn't configured yet
      ((not current-config)
       (message "khoj.el: Chat not configured yet.")
       (setq config (delq (assoc 'processor config) config))
       (cl-pushnew `(processor . ((conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir))
+                                                  (enable-offline-chat . ,enable-offline-chat)
                                                   (openai . ((chat-model . ,chat-model)
                                                              (api-key . ,khoj-openai-api-key)))))))
                   config))
 
+     ;; Else if chat isn't configured in khoj backend
      ((not (alist-get 'conversation (alist-get 'processor config)))
       (message "khoj.el: Chat not configured yet.")
        (let ((new-processor-type (alist-get 'processor config)))
          (setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type))
          (cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir))
+                                       (enable-offline-chat . ,enable-offline-chat)
                                        (openai . ((chat-model . ,chat-model)
                                                   (api-key . ,khoj-openai-api-key)))))
                      new-processor-type)
         (setq config (delq (assoc 'processor config) config))
         (cl-pushnew `(processor . ,new-processor-type) config)))
 
-     ;; Else if khoj is not configured with specified openai api key
+     ;; Else if chat configuration in khoj backend has gone stale
      ((not (and (equal (alist-get 'api-key (alist-get 'openai (alist-get 'conversation (alist-get 'processor config)))) khoj-openai-api-key)
-                (equal (alist-get 'chat-model (alist-get 'openai (alist-get 'conversation (alist-get 'processor config)))) khoj-chat-model)))
+                (equal (alist-get 'chat-model (alist-get 'openai (alist-get 'conversation (alist-get 'processor config)))) khoj-chat-model)
+                (equal (alist-get 'enable-offline-chat (alist-get 'conversation (alist-get 'processor config))) enable-offline-chat)))
       (message "khoj.el: Chat configuration has gone stale.")
       (let* ((chat-directory (khoj--get-directory-from-config config '(processor conversation conversation-logfile)))
              (new-processor-type (alist-get 'processor config)))
         (setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type))
         (cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" chat-directory))
+                                      (enable-offline-chat . ,enable-offline-chat)
                                       (openai . ((chat-model . ,khoj-chat-model)
                                                  (api-key . ,khoj-openai-api-key)))))
                     new-processor-type)
diff --git a/tests/test_text_search.py b/tests/test_text_search.py
index 1ae7e770..4d775e92 100644
--- a/tests/test_text_search.py
+++ b/tests/test_text_search.py
@@ -77,7 +77,7 @@ def test_text_index_same_if_content_unchanged(content_config: ContentConfig, sea
 
 # ----------------------------------------------------------------------------------------------------
 @pytest.mark.anyio
-async def test_asymmetric_search(content_config: ContentConfig, search_config: SearchConfig):
+async def test_text_search(content_config: ContentConfig, search_config: SearchConfig):
     # Arrange
     search_models.text_search = text_search.initialize_model(search_config.asymmetric)
     content_index.org = text_search.setup(
@@ -93,7 +93,7 @@ async def test_asymmetric_search(content_config: ContentConfig, search_config: S
     results = text_search.collate_results(hits, entries, count=1)
 
     # Assert
-    # Actual_data should contain "Khoj via Emacs" entry
+    # search results should contain "git clone" entry
     search_result = results[0].entry
     assert "git clone" in search_result
 
@@ -262,7 +262,7 @@ def test_update_index_with_new_entry(content_config: ContentConfig, search_model
 
 # ----------------------------------------------------------------------------------------------------
 @pytest.mark.skipif(os.getenv("GITHUB_PAT_TOKEN") is None, reason="GITHUB_PAT_TOKEN not set")
-def test_asymmetric_setup_github(content_config: ContentConfig, search_models: SearchModels):
+def test_text_search_setup_github(content_config: ContentConfig, search_models: SearchModels):
     # Act
     # Regenerate github embeddings to test asymmetric setup without caching
     github_model = text_search.setup(