diff --git a/Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift b/Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift
index 3484e34d..83041538 100644
--- a/Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift
+++ b/Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift
@@ -67,7 +67,7 @@ struct ChatSettingsGeneralSectionView: View {
                     case .browser:
                         Text("Open web page in browser").tag(mode)
                     case .codeiumChat:
-                        Text("Open Codeium chat tab (beta)").tag(mode)
+                        Text("Open Codeium chat tab").tag(mode)
                     }
                 }
             }
diff --git a/Tool/Sources/CodeiumService/ChatTab/CodeiumChatTab.swift b/Tool/Sources/CodeiumService/ChatTab/CodeiumChatTab.swift
index d2dcb704..8a40da2b 100644
--- a/Tool/Sources/CodeiumService/ChatTab/CodeiumChatTab.swift
+++ b/Tool/Sources/CodeiumService/ChatTab/CodeiumChatTab.swift
@@ -140,11 +140,11 @@ public class CodeiumChatTab: ChatTab {
     }
 
     public static func chatBuilders() -> [ChatTabBuilder] {
-        [Builder(title: "Codeium Chat (Beta)")]
+        [Builder(title: "Codeium Chat")]
     }
 
 	public static func defaultChatBuilder() -> ChatTabBuilder {
-        Builder(title: "Codeium Chat (Beta)")
+        Builder(title: "Codeium Chat")
     }
 }
 
diff --git a/Tool/Sources/CodeiumService/Services/CodeiumService.swift b/Tool/Sources/CodeiumService/Services/CodeiumService.swift
index ba05bae0..3aa03540 100644
--- a/Tool/Sources/CodeiumService/Services/CodeiumService.swift
+++ b/Tool/Sources/CodeiumService/Services/CodeiumService.swift
@@ -351,6 +351,8 @@ extension CodeiumService: CodeiumSuggestionServiceType {
             URLQueryItem(name: "ide_version", value: metadata.ide_version),
             URLQueryItem(name: "web_server_url", value: webServerUrl),
             URLQueryItem(name: "ide_telemetry_enabled", value: "true"),
+            URLQueryItem(name: "has_enterprise_extension", value: String(UserDefaults.shared.value(for: \.codeiumEnterpriseMode))),
+            URLQueryItem(name: "has_index_service", value: String(UserDefaults.shared.value(for: \.codeiumIndexEnabled)))
         ]
 
         if let url = components.url {