diff --git a/src/CSSMotionList.tsx b/src/CSSMotionList.tsx
index 04ca651..49df3b5 100644
--- a/src/CSSMotionList.tsx
+++ b/src/CSSMotionList.tsx
@@ -2,6 +2,7 @@
 import * as React from 'react';
 import type { CSSMotionProps } from './CSSMotion';
 import OriginCSSMotion, { isRefNotConsumed } from './CSSMotion';
+import useIsomorphicLayoutEffect from './hooks/useIsomorphicLayoutEffect';
 import type { KeyObject } from './util/diff';
 import {
   diffKeys,
@@ -67,6 +68,65 @@ export interface CSSMotionListState {
   keyEntities: KeyObject[];
 }
 
+function getDerivedKeyEntities(
+  keys: CSSMotionListProps['keys'],
+  keyEntities: KeyObject[],
+) {
+  const parsedKeyObjects = parseKeys(keys);
+  const mixedKeyEntities = diffKeys(keyEntities, parsedKeyObjects);
+
+  const nextKeyEntities = mixedKeyEntities.filter(entity => {
+    const prevEntity = keyEntities.find(({ key }) => entity.key === key);
+
+    // Remove if already mark as removed
+    if (
+      prevEntity &&
+      prevEntity.status === STATUS_REMOVED &&
+      entity.status === STATUS_REMOVE
+    ) {
+      return false;
+    }
+    return true;
+  });
+
+  return isSameKeyEntities(keyEntities, nextKeyEntities)
+    ? keyEntities
+    : nextKeyEntities;
+}
+
+function shallowEqualKeyObject(origin: KeyObject, target: KeyObject) {
+  if (origin === target) {
+    return true;
+  }
+
+  const originRecord = origin as Record<string, any>;
+  const targetRecord = target as Record<string, any>;
+  const originKeys = Object.keys(originRecord);
+  const targetKeys = Object.keys(targetRecord);
+
+  return (
+    originKeys.length === targetKeys.length &&
+    originKeys.every(
+      key =>
+        Object.prototype.hasOwnProperty.call(targetRecord, key) &&
+        Object.is(originRecord[key], targetRecord[key]),
+    )
+  );
+}
+
+function isSameKeyEntities(origin: KeyObject[], target: KeyObject[]) {
+  if (origin === target) {
+    return true;
+  }
+
+  return (
+    origin.length === target.length &&
+    origin.every((entity, index) =>
+      shallowEqualKeyObject(entity, target[index]),
+    )
+  );
+}
+
 /**
  * Generate a CSSMotionList component with config
  * @param transitionSupport No need since CSSMotionList no longer depends on transition support
@@ -75,123 +135,107 @@ export interface CSSMotionListState {
 export function genCSSMotionList(
   transitionSupport: boolean,
   CSSMotion = OriginCSSMotion,
-): React.ComponentClass<CSSMotionListProps> {
-  class CSSMotionList extends React.Component<
-    CSSMotionListProps,
-    CSSMotionListState
-  > {
-    static defaultProps = {
-      component: 'div',
-    };
-
-    state: CSSMotionListState = {
-      keyEntities: [],
-    };
-
-    static getDerivedStateFromProps(
-      { keys }: CSSMotionListProps,
-      { keyEntities }: CSSMotionListState,
-    ) {
-      const parsedKeyObjects = parseKeys(keys);
-      const mixedKeyEntities = diffKeys(keyEntities, parsedKeyObjects);
-
-      return {
-        keyEntities: mixedKeyEntities.filter(entity => {
-          const prevEntity = keyEntities.find(({ key }) => entity.key === key);
-
-          // Remove if already mark as removed
-          if (
-            prevEntity &&
-            prevEntity.status === STATUS_REMOVED &&
-            entity.status === STATUS_REMOVE
-          ) {
-            return false;
-          }
-          return true;
-        }),
-      };
+): React.ComponentType<CSSMotionListProps> {
+  const CSSMotionList: React.FC<CSSMotionListProps> = props => {
+    const {
+      component = 'div',
+      children,
+      onVisibleChanged,
+      onAllRemoved,
+      ...restProps
+    } = props;
+    const { keys } = restProps;
+
+    const [keyEntities, setKeyEntities] = React.useState<KeyObject[]>(() =>
+      getDerivedKeyEntities(keys, []),
+    );
+    const prevKeyEntitiesRef = React.useRef<KeyObject[]>(keyEntities);
+    const onAllRemovedRef = React.useRef(onAllRemoved);
+
+    onAllRemovedRef.current = onAllRemoved;
+
+    let mergedKeyEntities = keyEntities;
+    const nextKeyEntities = getDerivedKeyEntities(keys, keyEntities);
+    if (!isSameKeyEntities(keyEntities, nextKeyEntities)) {
+      setKeyEntities(nextKeyEntities);
+      mergedKeyEntities = nextKeyEntities;
     }
 
-    // ZombieJ: Return the count of rest keys. It's safe to refactor if need more info.
-    removeKey = (removeKey: React.Key) => {
-      this.setState(
-        prevState => {
-          const nextKeyEntities = prevState.keyEntities.map(entity => {
-            if (entity.key !== removeKey) return entity;
-            return {
-              ...entity,
-              status: STATUS_REMOVED,
-            };
-          });
+    useIsomorphicLayoutEffect(() => {
+      const prevActiveCount = prevKeyEntitiesRef.current.filter(
+        ({ status }) => status !== STATUS_REMOVED,
+      ).length;
+      const currentActiveCount = mergedKeyEntities.filter(
+        ({ status }) => status !== STATUS_REMOVED,
+      ).length;
+
+      if (prevActiveCount > 0 && currentActiveCount === 0) {
+        onAllRemovedRef.current?.();
+      }
 
+      prevKeyEntitiesRef.current = mergedKeyEntities;
+    }, [mergedKeyEntities]);
+
+    // ZombieJ: Return the count of rest keys. It's safe to refactor if need more info.
+    const removeKey = React.useCallback((removedKey: React.Key) => {
+      setKeyEntities(prevKeyEntities => {
+        const nextRemovedKeyEntities = prevKeyEntities.map(entity => {
+          if (entity.key !== removedKey) return entity;
           return {
-            keyEntities: nextKeyEntities,
+            ...entity,
+            status: STATUS_REMOVED,
           };
-        },
-        () => {
-          const { keyEntities } = this.state;
-          const restKeysCount = keyEntities.filter(
-            ({ status }) => status !== STATUS_REMOVED,
-          ).length;
-
-          if (restKeysCount === 0 && this.props.onAllRemoved) {
-            this.props.onAllRemoved();
-          }
-        },
-      );
-    };
-
-    render() {
-      const { keyEntities } = this.state;
-      const {
-        component,
-        children,
-        onVisibleChanged,
-        onAllRemoved,
-        ...restProps
-      } = this.props;
-
-      const Component = component || React.Fragment;
-
-      const motionProps: CSSMotionProps = {};
-      MOTION_PROP_NAMES.forEach(prop => {
-        motionProps[prop] = restProps[prop];
-        delete restProps[prop];
+        });
+
+        return isSameKeyEntities(prevKeyEntities, nextRemovedKeyEntities)
+          ? prevKeyEntities
+          : nextRemovedKeyEntities;
       });
-      delete restProps.keys;
-
-      return (
-        <Component {...restProps}>
-          {keyEntities.map(({ status, ...eventProps }, index) => {
-            const visible = status === STATUS_ADD || status === STATUS_KEEP;
-            return (
-              <CSSMotion
-                {...motionProps}
-                key={eventProps.key}
-                visible={visible}
-                eventProps={eventProps}
-                onVisibleChanged={changedVisible => {
-                  onVisibleChanged?.(changedVisible, { key: eventProps.key });
-
-                  if (!changedVisible) {
-                    this.removeKey(eventProps.key);
-                  }
-                }}
-              >
-                {isRefNotConsumed(children)
-                  ? props =>
-                      (children as ChildrenWithoutRef)({
-                        ...props,
-                        index,
-                      })
-                  : (props, ref) => children({ ...props, index }, ref)}
-              </CSSMotion>
-            );
-          })}
-        </Component>
-      );
-    }
-  }
+    }, []);
+
+    const Component = component || React.Fragment;
+
+    const motionProps: CSSMotionProps = {};
+    MOTION_PROP_NAMES.forEach(prop => {
+      motionProps[prop] = restProps[prop];
+      delete restProps[prop];
+    });
+    delete restProps.keys;
+
+    return (
+      <Component {...restProps}>
+        {mergedKeyEntities.map(({ status, ...eventProps }, index) => {
+          const visible = status === STATUS_ADD || status === STATUS_KEEP;
+          return (
+            <CSSMotion
+              {...motionProps}
+              key={eventProps.key}
+              visible={visible}
+              eventProps={eventProps}
+              onVisibleChanged={changedVisible => {
+                onVisibleChanged?.(changedVisible, { key: eventProps.key });
+
+                if (!changedVisible) {
+                  removeKey(eventProps.key);
+                }
+              }}
+            >
+              {isRefNotConsumed(children)
+                ? motionChildrenProps =>
+                    (children as ChildrenWithoutRef)({
+                      ...motionChildrenProps,
+                      index,
+                    })
+                : (motionChildrenProps, ref) =>
+                    children({ ...motionChildrenProps, index }, ref)}
+            </CSSMotion>
+          );
+        })}
+      </Component>
+    );
+  };
+
+  CSSMotionList.displayName = 'CSSMotionList';
 
   return CSSMotionList;
 }
diff --git a/tests/CSSMotionList.spec.tsx b/tests/CSSMotionList.spec.tsx
index eff199c..5392b12 100644
--- a/tests/CSSMotionList.spec.tsx
+++ b/tests/CSSMotionList.spec.tsx
@@ -173,4 +173,105 @@ describe('CSSMotionList', () => {
       '1',
     );
   });
+
+  it('should support children ref when component is false', () => {
+    const CSSMotionList = genCSSMotionList(false);
+
+    const { container } = render(
+      <CSSMotionList motionName="transition" component={false} keys={['a']}>
+        {({ key }, ref) => (
+          <div ref={ref as React.Ref<HTMLDivElement>} className="motion-box">
+            {key}
+          </div>
+        )}
+      </CSSMotionList>,
+    );
+
+    expect(container.children).toHaveLength(1);
+    expect(container.querySelector('.motion-box')).toHaveTextContent('a');
+  });
+
+  it('should not require onAllRemoved', () => {
+    const CSSMotionList = genCSSMotionList(false);
+
+    const Demo = ({ keys }: { keys: string[] }) => (
+      <CSSMotionList motionName="transition" keys={keys}>
+        {({ key }) => <div className="motion-box">{key}</div>}
+      </CSSMotionList>
+    );
+
+    const { rerender } = render(<Demo keys={['a']} />);
+
+    act(() => {
+      jest.runAllTimers();
+    });
+
+    expect(() => {
+      rerender(<Demo keys={[]} />);
+      act(() => {
+        jest.runAllTimers();
+      });
+    }).not.toThrow();
+  });
+
+  it('should skip state update when removed key is already removed', () => {
+    const CSSMotion = React.forwardRef<any, any>(
+      ({ children, eventProps, onVisibleChanged }, _ref) => (
+        <button
+          className="trigger"
+          type="button"
+          onClick={() => {
+            onVisibleChanged(false);
+            onVisibleChanged(false);
+          }}
+        >
+          {children(eventProps)}
+        </button>
+      ),
+    );
+    const CSSMotionList = genCSSMotionList(false, CSSMotion);
+
+    const Demo = ({ keys }: { keys: string[] }) => (
+      <CSSMotionList motionName="transition" keys={keys}>
+        {({ key }) => <span className="motion-box">{key}</span>}
+      </CSSMotionList>
+    );
+
+    const { container, rerender } = render(<Demo keys={['a']} />);
+    rerender(<Demo keys={[]} />);
+    const trigger = container.querySelector('.trigger');
+    fireEvent.click(trigger);
+
+    expect(container.querySelector('.motion-box')).toBeFalsy();
+  });
+
+  it('should update event props when key object shape changes', () => {
+    const CSSMotionList = genCSSMotionList(false);
+    const hasOwn = Object.prototype.hasOwnProperty;
+
+    const Demo = ({ keys }: { keys: CSSMotionListProps['keys'] }) => (
+      <CSSMotionList motionName="transition" keys={keys}>
+        {props => (
+          <div
+            className="motion-box"
+            data-has-foo={hasOwn.call(props, 'foo')}
+            data-has-bar={hasOwn.call(props, 'bar')}
+          />
+        )}
+      </CSSMotionList>
+    );
+
+    const { container, rerender } = render(
+      <Demo keys={[{ key: 'a', foo: undefined }]} />,
+    );
+    const getBox = () => container.querySelector<HTMLDivElement>('.motion-box');
+
+    expect(getBox()).toHaveAttribute('data-has-foo', 'true');
+    expect(getBox()).toHaveAttribute('data-has-bar', 'false');
+
+    rerender(<Demo keys={[{ key: 'a', bar: undefined }]} />);
+
+    expect(getBox()).toHaveAttribute('data-has-foo', 'false');
+    expect(getBox()).toHaveAttribute('data-has-bar', 'true');
+  });
 });