diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 6f9ff031..dc180328 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -356,6 +356,7 @@
       {#each sorting ? displayedSortedRows : displayedRows as row, i (row.id)}
         <TableRow
           id="row-{row.id}"
+          data-parent-row="{expandable ? true : undefined}"
           class="{selectedRowIds.includes(row.id)
             ? 'bx--data-table--selected'
             : ''} {expandedRows[row.id] ? 'bx--expandable-row' : ''} {expandable
@@ -483,14 +484,16 @@
           {/each}
         </TableRow>
 
-        {#if expandable && expandedRows[row.id] && !nonExpandableRowIds.includes(row.id)}
+        {#if expandable}
           <tr
             data-child-row
             class:bx--expandable-row="{true}"
             on:mouseenter="{() => {
+              if (nonExpandableRowIds.includes(row.id)) return;
               parentRowId = row.id;
             }}"
             on:mouseleave="{() => {
+              if (nonExpandableRowIds.includes(row.id)) return;
               parentRowId = null;
             }}"
           >