diff --git a/packages/ibm-products/src/components/Datagrid/useFocusRowExpander.js b/packages/ibm-products/src/components/Datagrid/useFocusRowExpander.js
index 594bd1f345..1afc899e95 100644
--- a/packages/ibm-products/src/components/Datagrid/useFocusRowExpander.js
+++ b/packages/ibm-products/src/components/Datagrid/useFocusRowExpander.js
@@ -36,7 +36,7 @@ export const useFocusRowExpander = ({
       const rowExpander = activeRow[0].querySelector(
         `.${blockClass}__row-expander`
       );
-      rowExpander.focus();
+      rowExpander?.focus();
     }
   }, [
     instance?.tableId,