diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index dc180328..1585656d 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -497,13 +497,15 @@
               parentRowId = null;
             }}"
           >
-            <TableCell
-              colspan="{selectable ? headers.length + 2 : headers.length + 1}"
-            >
-              <div class:bx--child-row-inner-container="{true}">
-                <slot name="expanded-row" row="{row}" />
-              </div>
-            </TableCell>
+            {#if expandedRows[row.id] && !nonExpandableRowIds.includes(row.id)}
+              <TableCell
+                colspan="{selectable ? headers.length + 2 : headers.length + 1}"
+              >
+                <div class:bx--child-row-inner-container="{true}">
+                  <slot name="expanded-row" row="{row}" />
+                </div>
+              </TableCell>
+            {/if}
           </tr>
         {/if}
       {/each}