diff --git a/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx b/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
index 8e0a12c73..620e5ce39 100644
--- a/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
 
 import { ActivityEditor } from '@/activities/components/ActivityEditor';
 import { ActivityEditorEffect } from '@/activities/components/ActivityEditorEffect';
+import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
 
 const StyledContainer = styled.div`
   box-sizing: border-box;
@@ -26,6 +27,7 @@ export const RightDrawerActivity = ({
 }: RightDrawerActivityProps) => {
   return (
     <StyledContainer>
+      <RecordValueSetterEffect recordId={activityId} />
       <ActivityEditorEffect activityId={activityId} />
       <ActivityEditor
         activityId={activityId}
diff --git a/packages/twenty-front/src/pages/tasks/Tasks.tsx b/packages/twenty-front/src/pages/tasks/Tasks.tsx
index 446bd1aed..c1cfd3a28 100644
--- a/packages/twenty-front/src/pages/tasks/Tasks.tsx
+++ b/packages/twenty-front/src/pages/tasks/Tasks.tsx
@@ -6,6 +6,7 @@ import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButt
 import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
 import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
 import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
+import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
@@ -49,36 +50,38 @@ export const Tasks = () => {
 
   return (
     <PageContainer>
-      <RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}>
-        <TasksEffect filterDropdownId={filterDropdownId} />
-        <PageHeader title="Tasks" Icon={IconCheckbox}>
-          <PageAddTaskButton />
-        </PageHeader>
-        <PageBody>
-          <StyledTasksContainer>
-            <TopBar
-              leftComponent={
-                <StyledTabListContainer>
-                  <TabList
-                    tabListId={TASKS_TAB_LIST_COMPONENT_ID}
-                    tabs={TASK_TABS}
+      <RecordFieldValueSelectorContextProvider>
+        <RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}>
+          <TasksEffect filterDropdownId={filterDropdownId} />
+          <PageHeader title="Tasks" Icon={IconCheckbox}>
+            <PageAddTaskButton />
+          </PageHeader>
+          <PageBody>
+            <StyledTasksContainer>
+              <TopBar
+                leftComponent={
+                  <StyledTabListContainer>
+                    <TabList
+                      tabListId={TASKS_TAB_LIST_COMPONENT_ID}
+                      tabs={TASK_TABS}
+                    />
+                  </StyledTabListContainer>
+                }
+                rightComponent={
+                  <ObjectFilterDropdownButton
+                    filterDropdownId={filterDropdownId}
+                    key="tasks-filter-dropdown-button"
+                    hotkeyScope={{
+                      scope: RelationPickerHotkeyScope.RelationPicker,
+                    }}
                   />
-                </StyledTabListContainer>
-              }
-              rightComponent={
-                <ObjectFilterDropdownButton
-                  filterDropdownId={filterDropdownId}
-                  key="tasks-filter-dropdown-button"
-                  hotkeyScope={{
-                    scope: RelationPickerHotkeyScope.RelationPicker,
-                  }}
-                />
-              }
-            />
-            <TaskGroups filterDropdownId={filterDropdownId} />
-          </StyledTasksContainer>
-        </PageBody>
-      </RecoilScope>
+                }
+              />
+              <TaskGroups filterDropdownId={filterDropdownId} />
+            </StyledTasksContainer>
+          </PageBody>
+        </RecoilScope>
+      </RecordFieldValueSelectorContextProvider>
     </PageContainer>
   );
 };