diff --git a/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte b/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
index 4a1a4bf9..ff08ef97 100644
--- a/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
+++ b/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
@@ -48,7 +48,7 @@
 </script>
 
 <DataTable
-  expandable
+  batchExpansion
   nonExpandableRowIds="{rows
     .filter((row) => row.port < 3000)
     .map((row) => row.id)}"
diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 7b932b67..856192ad 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -345,7 +345,8 @@
             <TableCell
               class="bx--table-expand"
               headers="expand"
-              data-previous-value="{expandedRows[row.id]
+              data-previous-value="{!nonExpandableRowIds.includes(row.id) &&
+              expandedRows[row.id]
                 ? 'collapsed'
                 : undefined}"
             >