diff --git a/packages/client/src/components/GlobalEvents/EditRoomEvent.js b/packages/client/src/components/GlobalEvents/EditRoomEvent.js
index 0aa80775cb..45016aa620 100644
--- a/packages/client/src/components/GlobalEvents/EditRoomEvent.js
+++ b/packages/client/src/components/GlobalEvents/EditRoomEvent.js
@@ -75,6 +75,7 @@ const EditRoomEvent = ({
       zoom: 1,
     },
     roomOwner: item.createdBy,
+    indexing: item.indexing,
   };
 
   const updateRoom = (oldRoom, newRoom) => {
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
index cf6aa2302d..dd05ede743 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
@@ -76,6 +76,7 @@ const CreateRoomDialog = ({
       y: 0.5,
       zoom: 1,
     },
+    indexing: false, // VDR Automatic indexing
   };
 
   const [roomParams, setRoomParams] = useState({ ...startRoomParams });
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
index 62de4ea147..b846246770 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
@@ -39,7 +39,8 @@ const EditRoomDialog = ({
         currentParams.tags.sort().toString() &&
       ((prevParams.icon.uploadedFile === "" &&
         currentParams.icon.uploadedFile === null) ||
-        prevParams.icon.uploadedFile === currentParams.icon.uploadedFile)
+        prevParams.icon.uploadedFile === currentParams.icon.uploadedFile) &&
+      prevParams.indexing === currentParams.indexing
     );
   };
 
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
index a4a1c63569..f463b75899 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
@@ -157,7 +157,13 @@ const SetRoomParams = ({
         />
       )}
 
-      {isVDRRoom && <VirtualDataRoomBlock t={t} />}
+      {isVDRRoom && (
+        <VirtualDataRoomBlock
+          t={t}
+          roomParams={roomParams}
+          setRoomParams={setRoomParams}
+        />
+      )}
 
       {!isEdit && enableThirdParty && (
         <ThirdPartyStorage
diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/VirtualDataRoomBlock.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/VirtualDataRoomBlock.js
index b8a1423e15..c8b2e31ff4 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/VirtualDataRoomBlock.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/VirtualDataRoomBlock.js
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Trans } from "react-i18next";
 import styled from "styled-components";
 import Text from "@docspace/components/text";
@@ -64,17 +64,15 @@ const Block = ({
   );
 };
 
-const VirtualDataRoomBlock = ({ t }) => {
+const VirtualDataRoomBlock = ({ t, roomParams, setRoomParams }) => {
   const role = t("Translations:RoleViewer");
 
-  const [automaticIndexingChecked, setAutomaticIndexingChecked] =
-    useState(false);
   const [fileLifetimeChecked, setFileLifetimeChecked] = useState(false);
   const [copyAndDownloadChecked, setCopyAndDownloadChecked] = useState(false);
   const [watermarksChecked, setWatermarksChecked] = useState(false);
 
   const onChangeAutomaticIndexing = () => {
-    setAutomaticIndexingChecked(!automaticIndexingChecked);
+    setRoomParams({ ...roomParams, indexing: !roomParams.indexing });
   };
 
   const onChangeFileLifetime = () => {
@@ -96,7 +94,7 @@ const VirtualDataRoomBlock = ({ t }) => {
         bodyText={t("AutomaticIndexingDescription")}
         onChange={onChangeAutomaticIndexing}
         isDisabled={false}
-        isChecked={automaticIndexingChecked}
+        isChecked={roomParams.indexing}
       ></Block>
       <Block
         headerText={t("FileLifetime")}
diff --git a/packages/client/src/store/CreateEditRoomStore.js b/packages/client/src/store/CreateEditRoomStore.js
index eb3d311b58..d85bd107f7 100644
--- a/packages/client/src/store/CreateEditRoomStore.js
+++ b/packages/client/src/store/CreateEditRoomStore.js
@@ -93,6 +93,7 @@ class CreateEditRoomStore {
     const createRoomData = {
       roomType: roomParams.type,
       title: roomParams.title || t("Files:NewRoom"),
+      indexing: roomParams.indexing,
     };
 
     const createTagsData = roomParams.tags
diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js
index 409013e2ee..d41d3a54d6 100644
--- a/packages/client/src/store/FilesStore.js
+++ b/packages/client/src/store/FilesStore.js
@@ -3017,6 +3017,7 @@ class FilesStore {
         viewAccessability,
         mute,
         inRoom = true,
+        indexing,
       } = item;
 
       const thirdPartyIcon = this.thirdPartyStore.getThirdPartyIcon(
@@ -3170,6 +3171,7 @@ class FilesStore {
         viewAccessability,
         ...pluginOptions,
         inRoom,
+        indexing,
         isForm,
       };
     });