diff --git a/examples/demo/src/orders/OrderList.tsx b/examples/demo/src/orders/OrderList.tsx
index 43eab5bd8cb..e0337691324 100644
--- a/examples/demo/src/orders/OrderList.tsx
+++ b/examples/demo/src/orders/OrderList.tsx
@@ -1,14 +1,12 @@
 import * as React from 'react';
-import { Fragment, useCallback, useEffect, useState } from 'react';
+import { Fragment, useCallback } from 'react';
 import {
     AutocompleteInput,
     BooleanField,
     Datagrid,
     DateField,
     DateInput,
-    RaRecord,
     List,
-    ListContextProvider,
     NullableBooleanInput,
     NumberField,
     ReferenceInput,
@@ -87,38 +85,12 @@ const useGetTotals = (filterValues: any) => {
 
 const TabbedDatagrid = () => {
     const listContext = useListContext();
-    const {
-        data,
-        filterValues,
-        setFilters,
-        displayedFilters,
-        isLoading,
-    } = listContext;
+    const { filterValues, setFilters, displayedFilters } = listContext;
     const isXSmall = useMediaQuery<Theme>(theme =>
         theme.breakpoints.down('sm')
     );
-    const [ordered, setOrdered] = useState<RaRecord[]>([]);
-    const [delivered, setDelivered] = useState<RaRecord[]>([]);
-    const [cancelled, setCancelled] = useState<RaRecord[]>([]);
     const totals = useGetTotals(filterValues) as any;
 
-    useEffect(() => {
-        if (isLoading) {
-            return;
-        }
-        switch (filterValues.status) {
-            case 'ordered':
-                setOrdered(data);
-                break;
-            case 'delivered':
-                setDelivered(data);
-                break;
-            case 'cancelled':
-                setCancelled(data);
-                break;
-        }
-    }, [data, isLoading, filterValues.status]);
-
     const handleChange = useCallback(
         (event: React.ChangeEvent<{}>, value: any) => {
             setFilters &&
@@ -131,13 +103,6 @@ const TabbedDatagrid = () => {
         [displayedFilters, filterValues, setFilters]
     );
 
-    const selectedData =
-        filterValues.status === 'ordered'
-            ? ordered
-            : filterValues.status === 'delivered'
-            ? delivered
-            : cancelled;
-
     return (
         <Fragment>
             <Tabs
@@ -161,104 +126,88 @@ const TabbedDatagrid = () => {
             </Tabs>
             <Divider />
             {isXSmall ? (
-                <ListContextProvider
-                    value={{ ...listContext, data: selectedData }}
-                >
-                    <MobileGrid data={selectedData} />
-                </ListContextProvider>
+                <MobileGrid />
             ) : (
                 <>
                     {filterValues.status === 'ordered' && (
-                        <ListContextProvider
-                            value={{ ...listContext, ids: ordered }}
-                        >
-                            <Datagrid optimized rowClick="edit">
-                                <DateField source="date" showTime />
-                                <TextField source="reference" />
-                                <CustomerReferenceField />
-                                <ReferenceField
-                                    source="customer_id"
-                                    reference="customers"
-                                    link={false}
-                                    label="resources.commands.fields.address"
-                                >
-                                    <AddressField />
-                                </ReferenceField>
-                                <NbItemsField />
-                                <NumberField
-                                    source="total"
-                                    options={{
-                                        style: 'currency',
-                                        currency: 'USD',
-                                    }}
-                                    sx={{ fontWeight: 'bold' }}
-                                />
-                            </Datagrid>
-                        </ListContextProvider>
+                        <Datagrid optimized rowClick="edit">
+                            <DateField source="date" showTime />
+                            <TextField source="reference" />
+                            <CustomerReferenceField />
+                            <ReferenceField
+                                source="customer_id"
+                                reference="customers"
+                                link={false}
+                                label="resources.commands.fields.address"
+                            >
+                                <AddressField />
+                            </ReferenceField>
+                            <NbItemsField />
+                            <NumberField
+                                source="total"
+                                options={{
+                                    style: 'currency',
+                                    currency: 'USD',
+                                }}
+                                sx={{ fontWeight: 'bold' }}
+                            />
+                        </Datagrid>
                     )}
                     {filterValues.status === 'delivered' && (
-                        <ListContextProvider
-                            value={{ ...listContext, ids: delivered }}
-                        >
-                            <Datagrid rowClick="edit">
-                                <DateField source="date" showTime />
-                                <TextField source="reference" />
-                                <CustomerReferenceField />
-                                <ReferenceField
-                                    source="customer_id"
-                                    reference="customers"
-                                    link={false}
-                                    label="resources.commands.fields.address"
-                                >
-                                    <AddressField />
-                                </ReferenceField>
-                                <NbItemsField />
-                                <NumberField
-                                    source="total"
-                                    options={{
-                                        style: 'currency',
-                                        currency: 'USD',
-                                    }}
-                                    sx={{ fontWeight: 'bold' }}
-                                />
-                                <BooleanField
-                                    source="returned"
-                                    sx={{ mt: -0.5, mb: -0.5 }}
-                                />
-                            </Datagrid>
-                        </ListContextProvider>
+                        <Datagrid rowClick="edit">
+                            <DateField source="date" showTime />
+                            <TextField source="reference" />
+                            <CustomerReferenceField />
+                            <ReferenceField
+                                source="customer_id"
+                                reference="customers"
+                                link={false}
+                                label="resources.commands.fields.address"
+                            >
+                                <AddressField />
+                            </ReferenceField>
+                            <NbItemsField />
+                            <NumberField
+                                source="total"
+                                options={{
+                                    style: 'currency',
+                                    currency: 'USD',
+                                }}
+                                sx={{ fontWeight: 'bold' }}
+                            />
+                            <BooleanField
+                                source="returned"
+                                sx={{ mt: -0.5, mb: -0.5 }}
+                            />
+                        </Datagrid>
                     )}
                     {filterValues.status === 'cancelled' && (
-                        <ListContextProvider
-                            value={{ ...listContext, ids: cancelled }}
-                        >
-                            <Datagrid rowClick="edit">
-                                <DateField source="date" showTime />
-                                <TextField source="reference" />
-                                <CustomerReferenceField />
-                                <ReferenceField
-                                    source="customer_id"
-                                    reference="customers"
-                                    link={false}
-                                    label="resources.commands.fields.address"
-                                >
-                                    <AddressField />
-                                </ReferenceField>
-                                <NbItemsField />
-                                <NumberField
-                                    source="total"
-                                    options={{
-                                        style: 'currency',
-                                        currency: 'USD',
-                                    }}
-                                    sx={{ fontWeight: 'bold' }}
-                                />
-                                <BooleanField
-                                    source="returned"
-                                    sx={{ mt: -0.5, mb: -0.5 }}
-                                />
-                            </Datagrid>
-                        </ListContextProvider>
+                        <Datagrid rowClick="edit">
+                            <DateField source="date" showTime />
+                            <TextField source="reference" />
+                            <CustomerReferenceField />
+                            <ReferenceField
+                                source="customer_id"
+                                reference="customers"
+                                link={false}
+                                label="resources.commands.fields.address"
+                            >
+                                <AddressField />
+                            </ReferenceField>
+                            <NbItemsField />
+                            <NumberField
+                                source="total"
+                                options={{
+                                    style: 'currency',
+                                    currency: 'USD',
+                                }}
+                                sx={{ fontWeight: 'bold' }}
+                            />
+                            <BooleanField
+                                source="returned"
+                                sx={{ mt: -0.5, mb: -0.5 }}
+                            />
+                        </Datagrid>
                     )}
                 </>
             )}
diff --git a/packages/ra-core/src/controller/list/ListContextProvider.tsx b/packages/ra-core/src/controller/list/ListContextProvider.tsx
index 349c122ba5d..f24d63889ff 100644
--- a/packages/ra-core/src/controller/list/ListContextProvider.tsx
+++ b/packages/ra-core/src/controller/list/ListContextProvider.tsx
@@ -6,6 +6,7 @@ import {
     ListPaginationContext,
     usePickPaginationContext,
 } from './ListPaginationContext';
+import { ListControllerResult } from './useListController';
 
 /**
  * Create a List Context and several thematic List subcontext.
@@ -34,7 +35,13 @@ import {
  * @see ListContext
  * @see ListFilterContext
  */
-export const ListContextProvider = ({ value, children }) => (
+export const ListContextProvider = ({
+    value,
+    children,
+}: {
+    value: ListControllerResult;
+    children: React.ReactNode;
+}) => (
     <ListContext.Provider value={value}>
         <ListFilterContext.Provider value={usePickFilterContext(value)}>
             <ListSortContext.Provider value={usePickSortContext(value)}>
diff --git a/packages/ra-core/src/controller/list/useListController.ts b/packages/ra-core/src/controller/list/useListController.ts
index 2530b9dc1ac..f57a39785f5 100644
--- a/packages/ra-core/src/controller/list/useListController.ts
+++ b/packages/ra-core/src/controller/list/useListController.ts
@@ -219,7 +219,7 @@ export interface ListControllerResult<RecordType extends RaRecord = any> {
     onUnselectItems: () => void;
     page: number;
     perPage: number;
-    refetch: UseGetListHookValue<RecordType>['refetch'];
+    refetch: (() => void) | UseGetListHookValue<RecordType>['refetch'];
     resource: string;
     selectedIds: RecordType['id'][];
     setFilters: (
diff --git a/packages/ra-core/src/form/choices/ChoicesContext.ts b/packages/ra-core/src/form/choices/ChoicesContext.ts
index 3421d93bba5..d7b2340cc48 100644
--- a/packages/ra-core/src/form/choices/ChoicesContext.ts
+++ b/packages/ra-core/src/form/choices/ChoicesContext.ts
@@ -1,4 +1,5 @@
 import { createContext } from 'react';
+import { UseGetListHookValue } from '../../dataProvider/useGetList';
 import { FilterPayload, RaRecord, SortPayload } from '../../types';
 
 /**
@@ -24,7 +25,7 @@ export type ChoicesContextValue<RecordType extends RaRecord = any> = {
     isLoading: boolean;
     page: number;
     perPage: number;
-    refetch: () => void;
+    refetch: (() => void) | UseGetListHookValue<RecordType>['refetch'];
     resource: string;
     selectedChoices: RecordType[];
     setFilters: (
diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx
index 68b53144cd4..0722981f328 100644
--- a/packages/ra-ui-materialui/src/field/ArrayField.tsx
+++ b/packages/ra-ui-materialui/src/field/ArrayField.tsx
@@ -87,7 +87,8 @@ export const ArrayField: FC<ArrayFieldProps> = memo(props => {
                 sort: { field: null, order: null },
                 displayedFilters: null,
                 filterValues: null,
-                hasCreate: null,
+                hasNextPage: null,
+                hasPreviousPage: null,
                 hideFilter: null,
                 isFetching: false,
                 isLoading: false,
@@ -96,6 +97,7 @@ export const ArrayField: FC<ArrayFieldProps> = memo(props => {
                 onUnselectItems: null,
                 page: null,
                 perPage: null,
+                refetch: null,
                 resource,
                 setFilters: null,
                 setPage: null,
diff --git a/packages/ra-ui-materialui/src/list/filter/FilterListItem.spec.tsx b/packages/ra-ui-materialui/src/list/filter/FilterListItem.spec.tsx
index 595bf994efb..85ddf678061 100644
--- a/packages/ra-ui-materialui/src/list/filter/FilterListItem.spec.tsx
+++ b/packages/ra-ui-materialui/src/list/filter/FilterListItem.spec.tsx
@@ -2,15 +2,41 @@ import * as React from 'react';
 import expect from 'expect';
 import { render, cleanup } from '@testing-library/react';
 
-import { ListContextProvider } from 'ra-core';
+import { ListContextProvider, ListControllerResult } from 'ra-core';
 import { FilterListItem } from './FilterListItem';
 
+const defaultListContext: ListControllerResult = {
+    data: [],
+    displayedFilters: null,
+    filterValues: null,
+    hasNextPage: false,
+    hasPreviousPage: false,
+    hideFilter: (filterName: string) => {},
+    isFetching: false,
+    isLoading: false,
+    onSelect: (ids: any[]) => {},
+    onToggleItem: (id: any) => {},
+    onUnselectItems: () => {},
+    page: 1,
+    perPage: 10,
+    refetch: () => {},
+    resource: 'posts',
+    selectedIds: [],
+    setFilters: (filters: any) => {},
+    setPage: (page: number) => {},
+    setPerPage: (perPage: number) => {},
+    setSort: (sort: any) => {},
+    showFilter: (filterName: string) => {},
+    sort: { field: '', order: 'ASC' },
+    total: 0,
+};
+
 describe('<FilterListItem/>', () => {
     afterEach(cleanup);
 
     it("should display the item label when it's a string", () => {
         const { queryByText } = render(
-            <ListContextProvider value={{ hideFilter: true }}>
+            <ListContextProvider value={defaultListContext}>
                 <FilterListItem label="Foo" value={{ foo: 'bar' }} />
             </ListContextProvider>
         );
@@ -19,7 +45,7 @@ describe('<FilterListItem/>', () => {
 
     it("should display the item label when it's an element", () => {
         const { queryByTestId } = render(
-            <ListContextProvider value={{ hideFilter: true }}>
+            <ListContextProvider value={defaultListContext}>
                 <FilterListItem
                     label={<span data-testid="123">Foo</span>}
                     value={{ foo: 'bar' }}
@@ -31,40 +57,40 @@ describe('<FilterListItem/>', () => {
 
     it('should not appear selected if filterValues is empty', () => {
         const { getByText } = render(
-            <ListContextProvider value={{ hideFilter: true }}>
+            <ListContextProvider value={defaultListContext}>
                 <FilterListItem label="Foo" value={{ foo: 'bar' }} />
             </ListContextProvider>
         );
-        expect(getByText('Foo').parentElement.dataset.selected).toBe('false');
+        expect(getByText('Foo').parentElement?.dataset.selected).toBe('false');
     });
 
     it('should not appear selected if filterValues does not contain value', () => {
         const { getByText } = render(
             <ListContextProvider
-                value={{ hideFilter: true, filterValues: { bar: 'baz' } }}
+                value={{ ...defaultListContext, filterValues: { bar: 'baz' } }}
             >
                 <FilterListItem label="Foo" value={{ foo: 'bar' }} />
             </ListContextProvider>
         );
-        expect(getByText('Foo').parentElement.dataset.selected).toBe('false');
+        expect(getByText('Foo').parentElement?.dataset.selected).toBe('false');
     });
 
     it('should appear selected if filterValues is equal to value', () => {
         const { getByText } = render(
             <ListContextProvider
-                value={{ hideFilter: true, filterValues: { foo: 'bar' } }}
+                value={{ ...defaultListContext, filterValues: { foo: 'bar' } }}
             >
                 <FilterListItem label="Foo" value={{ foo: 'bar' }} />
             </ListContextProvider>
         );
-        expect(getByText('Foo').parentElement.dataset.selected).toBe('true');
+        expect(getByText('Foo').parentElement?.dataset.selected).toBe('true');
     });
 
     it('should appear selected if filterValues is equal to value for nested filters', () => {
         const { getByText } = render(
             <ListContextProvider
                 value={{
-                    hideFilter: true,
+                    ...defaultListContext,
                     filterValues: {
                         $and: [
                             {
@@ -100,20 +126,20 @@ describe('<FilterListItem/>', () => {
                 />
             </ListContextProvider>
         );
-        expect(getByText('Foo').parentElement.dataset.selected).toBe('true');
+        expect(getByText('Foo').parentElement?.dataset.selected).toBe('true');
     });
 
     it('should appear selected if filterValues contains value', () => {
         const { getByText } = render(
             <ListContextProvider
                 value={{
-                    hideFilter: true,
+                    ...defaultListContext,
                     filterValues: { foo: 'bar', bar: 'baz' },
                 }}
             >
                 <FilterListItem label="Foo" value={{ foo: 'bar' }} />
             </ListContextProvider>
         );
-        expect(getByText('Foo').parentElement.dataset.selected).toBe('true');
+        expect(getByText('Foo').parentElement?.dataset.selected).toBe('true');
     });
 });