diff --git a/roles/tackle/tasks/kai.yml b/roles/tackle/tasks/kai.yml
index 26a1c08..ec1bf05 100644
--- a/roles/tackle/tasks/kai.yml
+++ b/roles/tackle/tasks/kai.yml
@@ -80,11 +80,19 @@
     state: "{{ kai_llm_proxy_state }}"
     template: kai/llm-proxy-service.yaml.j2
 
+- name: Check if LLM Proxy Client ConfigMap exists
+  k8s_info:
+    api_version: v1
+    kind: ConfigMap
+    name: "{{ kai_llm_proxy_client_config_name }}"
+    namespace: "{{ app_namespace }}"
+  register: llm_proxy_client_configmap_status
+
 - name: Create LLM Proxy Client Configuration
   k8s:
     state: present
     template: kai/llm-proxy-client-configmap.yaml.j2
-  when: kai_llm_proxy_enabled | bool
+  when: kai_llm_proxy_enabled | bool or (llm_proxy_client_configmap_status.resources | length) > 0
 
 - name: Create Kai API deployment
   k8s:
diff --git a/roles/tackle/templates/kai/llm-proxy-client-configmap.yaml.j2 b/roles/tackle/templates/kai/llm-proxy-client-configmap.yaml.j2
index 1af7c6c..03e4753 100644
--- a/roles/tackle/templates/kai/llm-proxy-client-configmap.yaml.j2
+++ b/roles/tackle/templates/kai/llm-proxy-client-configmap.yaml.j2
@@ -12,5 +12,6 @@ metadata:
 data:
   config.json: |
     {
-      "model": "{{ kai_llm_proxy_provider_id }}/{{ kai_llm_proxy_model_id }}"
+      "model": "{{ kai_llm_proxy_provider_id }}/{{ kai_llm_proxy_model_id }}",
+      "enabled": "{{ kai_llm_proxy_enabled | default(false) | bool | lower }}"
     }
\ No newline at end of file