diff --git a/src/app/components/chat-panel/chat-panel.component.html b/src/app/components/chat-panel/chat-panel.component.html
index 039be315..51ab7b7b 100644
--- a/src/app/components/chat-panel/chat-panel.component.html
+++ b/src/app/components/chat-panel/chat-panel.component.html
@@ -448,20 +448,22 @@
           >
             <mat-icon>attach_file</mat-icon>
           </button>
-          <button
-            mat-icon-button
-            [matMenuTriggerFor]="moreMenu"
-            class="function-event-button"
-            [matTooltip]="i18n.moreOptionsTooltip"
-            [disabled]="!(isManualStateUpdateEnabledObs | async)"
-          >
-            <mat-icon>more_vert</mat-icon>
-          </button>
-          <mat-menu #moreMenu="matMenu">
-            <span mat-menu-item [matTooltip]="i18n.updateStateMenuTooltip"
-              (click)="updateState.emit()"> {{ i18n.updateStateMenuLabel }}
-            </span>
-          </mat-menu>
+          @if (!hideMoreOptionsButton()) {
+            <button
+              mat-icon-button
+              [matMenuTriggerFor]="moreMenu"
+              class="function-event-button"
+              [matTooltip]="i18n.moreOptionsTooltip"
+              [disabled]="!(isManualStateUpdateEnabledObs | async)"
+            >
+              <mat-icon>more_vert</mat-icon>
+            </button>
+            <mat-menu #moreMenu="matMenu">
+              <span mat-menu-item [matTooltip]="i18n.updateStateMenuTooltip"
+                (click)="updateState.emit()"> {{ i18n.updateStateMenuLabel }}
+              </span>
+            </mat-menu>
+          }
         </div>
         <div>
           <button
diff --git a/src/app/components/chat-panel/chat-panel.component.spec.ts b/src/app/components/chat-panel/chat-panel.component.spec.ts
index 37fab07b..75b3c1d5 100644
--- a/src/app/components/chat-panel/chat-panel.component.spec.ts
+++ b/src/app/components/chat-panel/chat-panel.component.spec.ts
@@ -65,6 +65,7 @@ describe('ChatPanelComponent', () => {
     mockFeatureFlagService.isBidiStreamingEnabledResponse.next(true);
     mockFeatureFlagService.isFeedbackServiceEnabledResponse.next(true);
     mockFeatureFlagService.isInfinityMessageScrollingEnabledResponse.next(true);
+    mockFeatureFlagService.isMoreOptionsButtonHiddenResponse.next(false);
 
     mockStringToColorService = new MockStringToColorService();
     mockStringToColorService.stc.and.returnValue('rgb(255, 0, 0)');
@@ -607,6 +608,22 @@ describe('ChatPanelComponent', () => {
         expect(textarea).toBeTruthy();
       });
     });
+
+    describe('when more options button is hidden', () => {
+      beforeEach(() => {
+        mockFeatureFlagService.isMoreOptionsButtonHiddenResponse.next(true);
+        fixture.detectChanges();
+      });
+
+      it('should not show more options button', () => {
+        const allButtons =
+            fixture.debugElement.queryAll(By.css('button[mat-icon-button]'));
+        const button = allButtons.find(
+            b => b.nativeElement.querySelector('mat-icon')
+                     ?.textContent?.trim() === 'more_vert');
+        expect(button).toBeFalsy();
+      });
+    });
   });
 
   describe('Loading state', () => {
diff --git a/src/app/components/chat-panel/chat-panel.component.ts b/src/app/components/chat-panel/chat-panel.component.ts
index fcaec892..83734adf 100644
--- a/src/app/components/chat-panel/chat-panel.component.ts
+++ b/src/app/components/chat-panel/chat-panel.component.ts
@@ -17,7 +17,7 @@
 
 import {TextFieldModule} from '@angular/cdk/text-field';
 import {CommonModule, NgClass} from '@angular/common';
-import {AfterViewInit, ChangeDetectionStrategy, Component, DestroyRef, effect, ElementRef, EventEmitter, HostListener, inject, input, Input, OnChanges, Output, signal, SimpleChanges, Type, ViewChild} from '@angular/core';
+import {AfterViewInit, ChangeDetectionStrategy, Component, DestroyRef, effect, ElementRef, EventEmitter, HostListener, inject, InjectionToken, input, Input, OnChanges, Output, signal, SimpleChanges, Type, ViewChild} from '@angular/core';
 import {takeUntilDestroyed, toSignal} from '@angular/core/rxjs-interop';
 import {FormsModule} from '@angular/forms';
 import {MatButtonModule} from '@angular/material/button';
@@ -163,6 +163,8 @@ export class ChatPanelComponent implements OnChanges, AfterViewInit {
       toSignal(this.featureFlagService.isFeedbackServiceEnabled());
   readonly isLoadingAgentResponse =
       toSignal(this.agentService.getLoadingState());
+  readonly hideMoreOptionsButton =
+      toSignal(this.featureFlagService.isMoreOptionsButtonHidden());
 
   protected readonly onScroll = new Subject<Event>();
   protected readonly sanitizer = inject(SAFE_VALUES_SERVICE);
diff --git a/src/app/core/services/feature-flag.service.ts b/src/app/core/services/feature-flag.service.ts
index e7906342..3bb04db4 100644
--- a/src/app/core/services/feature-flag.service.ts
+++ b/src/app/core/services/feature-flag.service.ts
@@ -130,4 +130,8 @@ export class FeatureFlagService implements FeatureFlagServiceInterface {
   isInfinityMessageScrollingEnabled(): Observable<boolean> {
     return of(false);
   }
+
+  isMoreOptionsButtonHidden(): Observable<boolean> {
+    return of(false);
+  }
 }
diff --git a/src/app/core/services/interfaces/feature-flag.ts b/src/app/core/services/interfaces/feature-flag.ts
index 45ef7e81..5897080d 100644
--- a/src/app/core/services/interfaces/feature-flag.ts
+++ b/src/app/core/services/interfaces/feature-flag.ts
@@ -53,4 +53,5 @@ export declare abstract class FeatureFlagService {
   abstract isDeveloperUiDisclaimerEnabled(): Observable<boolean>;
   abstract isFeedbackServiceEnabled(): Observable<boolean>;
   abstract isInfinityMessageScrollingEnabled(): Observable<boolean>;
+  abstract isMoreOptionsButtonHidden(): Observable<boolean>;
 }
diff --git a/src/app/core/services/testing/mock-feature-flag.service.ts b/src/app/core/services/testing/mock-feature-flag.service.ts
index 5e8cfb82..e514d446 100644
--- a/src/app/core/services/testing/mock-feature-flag.service.ts
+++ b/src/app/core/services/testing/mock-feature-flag.service.ts
@@ -115,4 +115,8 @@ export class MockFeatureFlagService implements FeatureFlagService {
   isInfinityMessageScrollingEnabled =
       jasmine.createSpy('isInfinityMessageScrollingEnabled')
           .and.returnValue(this.isInfinityMessageScrollingEnabledResponse);
+  isMoreOptionsButtonHiddenResponse = new ReplaySubject<boolean>(1);
+  isMoreOptionsButtonHidden =
+      jasmine.createSpy('isMoreOptionsButtonHidden')
+          .and.returnValue(this.isMoreOptionsButtonHiddenResponse);
 }