diff --git a/packages/element-web-module-api/element-web-module-api.api.md b/packages/element-web-module-api/element-web-module-api.api.md
index 90cd4df08f..49ce6f22cf 100644
--- a/packages/element-web-module-api/element-web-module-api.api.md
+++ b/packages/element-web-module-api/element-web-module-api.api.md
@@ -69,8 +69,6 @@ export interface CustomComponentsApi {
 // @alpha
 export type CustomMessageComponentProps = {
     mxEvent: MatrixEvent;
-    highlights?: string[];
-    forExport?: boolean;
 };
 
 // Warning: (ae-incompatible-release-tags) The symbol "CustomMessageRenderFunction" is marked as @beta, but its signature references "CustomMessageComponentProps" which is marked as @alpha
diff --git a/packages/element-web-module-api/src/api/custom-components.ts b/packages/element-web-module-api/src/api/custom-components.ts
index 01d589341e..87266de5ad 100644
--- a/packages/element-web-module-api/src/api/custom-components.ts
+++ b/packages/element-web-module-api/src/api/custom-components.ts
@@ -70,7 +70,11 @@ export interface CustomComponentsApi {
      *       return <YourCustomComponent mxEvent={props.mxEvent} />;
      *  });
      *  customComponents.registerMessageRenderer(/m\.room\.(topic|name)/, (props, originalComponent) => {
-     *       return <YourCustomStateRenderer mxEvent={props.mxEvent} />;
+     *       if (props.mxEvent.isState()) {
+     *           return <YourCustomStateRenderer mxEvent={props.mxEvent} />;
+     *       }
+     *       // Passthrough.
+     *       return null;
      *  });
      * ```
      */