diff --git a/js/file/shared/File.svelte b/js/file/shared/File.svelte
index 00fbb85cb650e..8b9753891024d 100644
--- a/js/file/shared/File.svelte
+++ b/js/file/shared/File.svelte
@@ -20,7 +20,7 @@
 	label={label || "File"}
 />
 
-{#if (Array.isArray(value) && value.length > 0) || value !== null}
+{#if value && (Array.isArray(value) ? value.length > 0 : true)}
 	<FilePreview {i18n} {selectable} on:select {value} {height} />
 {:else}
 	<Empty unpadded_box={true} size="large"><File /></Empty>
diff --git a/js/file/shared/FileUpload.svelte b/js/file/shared/FileUpload.svelte
index 3fca386dd7bd6..be6c4eaeb9560 100644
--- a/js/file/shared/FileUpload.svelte
+++ b/js/file/shared/FileUpload.svelte
@@ -67,7 +67,7 @@
 	label={label || "File"}
 />
 
-{#if (Array.isArray(value) && value.length > 0) || value !== null}
+{#if value && (Array.isArray(value) ? value.length > 0 : true)}
 	<ModifyUpload {i18n} on:clear={handle_clear} absolute />
 	<FilePreview {i18n} on:select {selectable} {value} {height} />
 {:else}