diff --git a/package-lock.json b/package-lock.json
index 089a892fc..1c34fa1c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25841,7 +25841,7 @@
     },
     "packages/map-template": {
       "name": "@mapsindoors/map-template",
-      "version": "1.96.17",
+      "version": "1.96.18",
       "dependencies": {
         "@mapsindoors/components": "*",
         "@mapsindoors/css": "^3.0.0",
diff --git a/packages/map-template/CHANGELOG.md b/packages/map-template/CHANGELOG.md
index 8920c6a2d..e295f7cf0 100644
--- a/packages/map-template/CHANGELOG.md
+++ b/packages/map-template/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.96.19] - 2026-03-26
+
+### Fixed
+
+- Added flag for chat window
+
 ## [1.96.18] - 2026-03-26
 
 ### Added
diff --git a/packages/map-template/src/components/MapTemplate/MapTemplate.jsx b/packages/map-template/src/components/MapTemplate/MapTemplate.jsx
index 627c21117..fd802b95e 100644
--- a/packages/map-template/src/components/MapTemplate/MapTemplate.jsx
+++ b/packages/map-template/src/components/MapTemplate/MapTemplate.jsx
@@ -809,7 +809,7 @@ function MapTemplate({ apiKey, gmApiKey, mapboxAccessToken, venue, locationId, p
     }, [language, appConfig, currentLanguage, setCurrentLanguage, userSelectedLanguage]);
 
     return (
-        <GeminiProvider enabled={true}>
+        <GeminiProvider enabled={appConfig?.appSettings?.enableChat === 'true'}>
             <div className={`mapsindoors-map
             ${currentAppView === appStates.DIRECTIONS ? 'mapsindoors-map--hide-elements' : 'mapsindoors-map--show-elements'}
             ${(venuesInSolution.length > 1 && showVenueSelector) ? '' : 'mapsindoors-map--hide-venue-selector'}