diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
index 6f7f41a24f..4b235268a6 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
@@ -1,15 +1,14 @@
-import Checkbox from "@docspace/components/checkbox";
-import React from "react";
+import React, { useState } from "react";
 import { inject, observer } from "mobx-react";
-
 import styled from "styled-components";
-import { StyledParam } from "../Params/StyledParam";
+import toastr from "@docspace/components/toast/toastr";
 
+import { StyledParam } from "../Params/StyledParam";
 import ToggleParam from "../Params/ToggleParam";
 import ThirpartyComboBox from "./ThirpartyComboBox";
 
+import Checkbox from "@docspace/components/checkbox";
 import Toast from "@docspace/components/toast";
-import toastr from "@docspace/components/toast/toastr";
 import FolderInput from "./FolderInput";
 import { combineUrl, getOAuthToken } from "@docspace/common/utils";
 
@@ -21,6 +20,7 @@ const StyledThirdPartyStorage = styled(StyledParam)`
 const ThirdPartyStorage = ({
   t,
 
+  roomTitle,
   storageLocation,
   onChangeStorageLocation,
 
@@ -58,15 +58,6 @@ const ThirdPartyStorage = ({
     }
   };
 
-  console.log(storageLocation);
-
-  const onChangeThirdpartyAccount = (thirdpartyAccount) => {
-    onChangeStorageLocation({
-      ...storageLocation,
-      thirdpartyAccount,
-    });
-  };
-
   const onChangeProvider = async (provider) => {
     if (!!storageLocation.thirdpartyAccount) {
       onChangeStorageLocation({
@@ -81,10 +72,10 @@ const ThirdPartyStorage = ({
     onChangeStorageLocation({ ...storageLocation, provider });
   };
 
-  const onChangeFolderPath = (e) =>
+  const onChangeStorageFolderId = (storageFolderId) =>
     onChangeStorageLocation({
       ...storageLocation,
-      storageFolderPath: e.target.value,
+      storageFolderId,
     });
 
   const onChangeRememberThirdpartyStorage = () => {
@@ -117,9 +108,10 @@ const ThirdPartyStorage = ({
       {storageLocation.isThirdparty && (
         <ThirpartyComboBox
           t={t}
-          connectItems={connectItems}
+          storageLocation={storageLocation}
+          onChangeStorageLocation={onChangeStorageLocation}
           onChangeProvider={onChangeProvider}
-          onChangeThirdpartyAccount={onChangeThirdpartyAccount}
+          connectItems={connectItems}
           setConnectDialogVisible={setConnectDialogVisible}
           setRoomCreation={setRoomCreation}
           saveThirdParty={saveThirdParty}
@@ -128,7 +120,6 @@ const ThirdPartyStorage = ({
           openConnectWindow={openConnectWindow}
           setConnectItem={setConnectItem}
           getOAuthToken={getOAuthToken}
-          storageLocation={storageLocation}
           setIsScrollLocked={setIsScrollLocked}
           setIsOauthWindowOpen={setIsOauthWindowOpen}
         />
@@ -136,8 +127,10 @@ const ThirdPartyStorage = ({
 
       {storageLocation.isThirdparty && storageLocation.thirdpartyAccount && (
         <FolderInput
-          value={storageLocation.storageFolderPath}
-          onChangeFolderPath={onChangeFolderPath}
+          t={t}
+          roomTitle={roomTitle}
+          thirdpartyAccount={storageLocation.thirdpartyAccount}
+          onChangeStorageFolderId={onChangeStorageFolderId}
         />
       )}