diff --git a/ee/config/feature_flags/development/ai_chat_history_context.yml b/ee/config/feature_flags/development/ai_chat_history_context.yml
deleted file mode 100644
index f53a256fc8c52a7f2c82134f5fc0d7abf94c8fc3..0000000000000000000000000000000000000000
--- a/ee/config/feature_flags/development/ai_chat_history_context.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ai_chat_history_context
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122920
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414606
-milestone: '16.1'
-type: development
-group: group::ai-enablement
-default_enabled: true
diff --git a/ee/lib/ee/gitlab/gon_helper.rb b/ee/lib/ee/gitlab/gon_helper.rb
index 3903a44a39861f8168be0b474b61f3cc2acfaeff..5237ede69f2bc7d41df9334bb2ceed481424930f 100644
--- a/ee/lib/ee/gitlab/gon_helper.rb
+++ b/ee/lib/ee/gitlab/gon_helper.rb
@@ -27,8 +27,6 @@ def add_gon_variables
           gon.payment_form_url                 = ::Gitlab::Routing.url_helpers.subscription_portal_payment_form_url
           gon.payment_validation_form_id       = ::Gitlab::SubscriptionPortal::PAYMENT_VALIDATION_FORM_ID
         end
-
-        push_frontend_feature_flag(:ai_chat_history_context, current_user)
       end
 
       # Exposes if a licensed feature is available.
diff --git a/ee/lib/gitlab/llm/chain/agents/zero_shot/executor.rb b/ee/lib/gitlab/llm/chain/agents/zero_shot/executor.rb
index 937b462b00dd1ad59584b53158a84ee096dfff34..b6708fe8efdc9f72675105246ea0a4a5fa64ac26 100644
--- a/ee/lib/gitlab/llm/chain/agents/zero_shot/executor.rb
+++ b/ee/lib/gitlab/llm/chain/agents/zero_shot/executor.rb
@@ -120,8 +120,6 @@ def last_conversation
             strong_memoize_attr :last_conversation
 
             def conversation
-              return [] unless Feature.enabled?(:ai_chat_history_context, context.current_user)
-
               # include only messages with successful response and reorder
               # messages so each question is followed by its answer
               by_request = last_conversation
diff --git a/ee/spec/frontend/ai/components/ai_genie_chat_spec.js b/ee/spec/frontend/ai/components/ai_genie_chat_spec.js
index c610f479b8fab9d2cbd1d8e0027c95cd8e56e22d..3675e7899de2461a7d3eeed7a3cc7a4dabe3fb4a 100644
--- a/ee/spec/frontend/ai/components/ai_genie_chat_spec.js
+++ b/ee/spec/frontend/ai/components/ai_genie_chat_spec.js
@@ -16,7 +16,7 @@ describe('AiGenieChat', () => {
     data = {},
     scopedSlots = {},
     slots = {},
-    glFeatures = { aiChatHistoryContext: true },
+    glFeatures = {},
   } = {}) => {
     jest.spyOn(AiGenieLoader.methods, 'computeTransitionWidth').mockImplementation();
 
diff --git a/ee/spec/lib/gitlab/llm/chain/agents/zero_shot/executor_spec.rb b/ee/spec/lib/gitlab/llm/chain/agents/zero_shot/executor_spec.rb
index f96efa95fcb89b9fd2000a13f7fbd5e1556b46aa..1e4b9e4e5df5a9597da028cc506eb143a7aa70f9 100644
--- a/ee/spec/lib/gitlab/llm/chain/agents/zero_shot/executor_spec.rb
+++ b/ee/spec/lib/gitlab/llm/chain/agents/zero_shot/executor_spec.rb
@@ -167,19 +167,6 @@
       agent.prompt
     end
 
-    context 'when ai_chat_history_context is disabled' do
-      before do
-        stub_feature_flags(ai_chat_history_context: false)
-      end
-
-      it 'includes an empty chat' do
-        expect(Gitlab::Llm::Chain::Agents::ZeroShot::Prompts::Anthropic)
-          .to receive(:prompt).once.with(a_hash_including(conversation: []))
-
-        agent.prompt
-      end
-    end
-
     it 'includes the prompt' do
       expect(Gitlab::Llm::Chain::Agents::ZeroShot::Prompts::Anthropic)
         .to receive(:prompt).once.with(a_hash_including(prompt_version: