diff --git a/frontend/src/lib/components/table/AutoDataTable.svelte b/frontend/src/lib/components/table/AutoDataTable.svelte
index 2cbd6bcf2d..b9f62fb8f6 100644
--- a/frontend/src/lib/components/table/AutoDataTable.svelte
+++ b/frontend/src/lib/components/table/AutoDataTable.svelte
@@ -161,7 +161,9 @@
 										return true
 									}
 								})
-								.map(({ rowData }) => Object.values(rowData).join(','))
+								.map(({ rowData }) => Object.values(rowData)
+									.map((field) => /[\",\n]/.test(field) ? "\"" + field.replace(/"/g, "\"\"") + "\"" : row)
+									.join(','))
 						].join('\n')
 
 						const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })