diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index 49d7264671..89f7e8716d 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -11,22 +11,23 @@
   export let customRenderers = []
 
   const plainTypes = ["string", "options", "number", "longform"]
+  const typeMap = {
+    boolean: BooleanRenderer,
+    datetime: DateTimeRenderer,
+    link: RelationshipRenderer,
+    attachment: AttachmentRenderer,
+    string: StringRenderer,
+    options: StringRenderer,
+    number: StringRenderer,
+    longform: StringRenderer,
+  }
   $: type = schema?.type ?? "string"
   $: customRenderer = customRenderers?.find(x => x.column === schema?.name)
+  $: renderer = customRenderer?.component ?? typeMap[type]
 </script>
 
-{#if value != null && value !== ''}
-  {#if customRenderer}
-    <svelte:component this={customRenderer.component} {schema} {value} />
-  {:else if plainTypes.includes(type)}
-    <StringRenderer {value} />
-  {:else if type === 'boolean'}
-    <BooleanRenderer {value} />
-  {:else if type === 'datetime'}
-    <DateTimeRenderer {value} />
-  {:else if type === 'link'}
-    <RelationshipRenderer {row} {schema} {value} on:clickrelationship />
-  {:else if type === 'attachment'}
-    <AttachmentRenderer {value} />
-  {/if}
+{#if renderer && value != null && value !== ''}
+  <svelte:component this={renderer} {row} {schema} {value} on:clickrelationship>
+    <slot />
+  </svelte:component>
 {/if}
diff --git a/packages/bbui/src/Table/StringRenderer.svelte b/packages/bbui/src/Table/StringRenderer.svelte
index 2756839616..ae95297dfc 100644
--- a/packages/bbui/src/Table/StringRenderer.svelte
+++ b/packages/bbui/src/Table/StringRenderer.svelte
@@ -3,6 +3,7 @@
 </script>
 
 <div>{value}</div>
+<slot />
 
 <style>
   div {
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index b8d65e243f..77e9eaee03 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -232,7 +232,9 @@
                           {row}
                           schema={schema[field]}
                           value={row[field]}
-                          on:clickrelationship />
+                          on:clickrelationship>
+                          <slot />
+                        </CellRenderer>
                       </div>
                     </td>
                   {/each}