diff --git a/src/lib/components/workspace/Knowledge/Collection/AddTextContentModal.svelte b/src/lib/components/workspace/Knowledge/Collection/AddTextContentModal.svelte
index 1822fd1a7..8af334bc2 100644
--- a/src/lib/components/workspace/Knowledge/Collection/AddTextContentModal.svelte
+++ b/src/lib/components/workspace/Knowledge/Collection/AddTextContentModal.svelte
@@ -40,6 +40,13 @@
 				<form
 					class="flex flex-col w-full"
 					on:submit|preventDefault={() => {
+						if (name.trim() === '' || content.trim() === '') {
+							toast.error($i18n.t('Please fill in all fields.'));
+							name = '';
+							content = '';
+							return;
+						}
+
 						dispatch('submit', {
 							name,
 							content
diff --git a/src/lib/components/workspace/Knowledge/CreateCollection.svelte b/src/lib/components/workspace/Knowledge/CreateCollection.svelte
index 406bfc15c..e078f4be3 100644
--- a/src/lib/components/workspace/Knowledge/CreateCollection.svelte
+++ b/src/lib/components/workspace/Knowledge/CreateCollection.svelte
@@ -15,6 +15,14 @@
 	const submitHandler = async () => {
 		loading = true;
 
+		if (name.trim() === '' || description.trim() === '') {
+			toast.error($i18n.t('Please fill in all fields.'));
+			name = '';
+			description = '';
+			loading = false;
+			return;
+		}
+
 		const res = await createNewKnowledge(localStorage.token, name, description).catch((e) => {
 			toast.error(e);
 		});