diff --git a/client/components/modals/podcast/tabs/EpisodeDetails.vue b/client/components/modals/podcast/tabs/EpisodeDetails.vue
index 85cfb4ff..9eaef85e 100644
--- a/client/components/modals/podcast/tabs/EpisodeDetails.vue
+++ b/client/components/modals/podcast/tabs/EpisodeDetails.vue
@@ -150,6 +150,12 @@ export default {
         this.$toast.info(this.$strings.ToastNoUpdatesNecessary)
         return false
       }
+
+      // Check pubdate is valid if it is being updated. Cannot be set to null in the web client
+      if (updatedDetails.pubDate === null) {
+        this.$toast.error(this.$strings.ToastEpisodePubDateUpdateFailed)
+        return null
+      }
       return this.updateDetails(updatedDetails)
     },
     async updateDetails(updatedDetails) {
diff --git a/client/components/ui/TextInputWithLabel.vue b/client/components/ui/TextInputWithLabel.vue
index f653a18b..ee9ffb7a 100644
--- a/client/components/ui/TextInputWithLabel.vue
+++ b/client/components/ui/TextInputWithLabel.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="w-full">
     <slot>
-      <label :for="identifier" class="px-1 text-sm font-semibold" :class="{ 'text-gray-400': disabled }"
-        >{{ label }}<em v-if="note" class="font-normal text-xs pl-2">{{ note }}</em></label
-      >
+      <label :for="identifier" class="px-1 text-sm font-semibold" :class="{ 'text-gray-400': disabled }">
+        {{ label }}
+        <em v-if="note" class="font-normal text-xs pl-2">{{ note }}</em>
+      </label>
     </slot>
     <ui-text-input :placeholder="placeholder || label" :inputId="identifier" ref="input" v-model="inputValue" :disabled="disabled" :readonly="readonly" :type="type" class="w-full" :class="inputClass" @blur="inputBlurred" />
   </div>
@@ -57,4 +58,4 @@ export default {
   },
   mounted() {}
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index f7af6aed..6c89db41 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -976,6 +976,7 @@
   "ToastEpisodeDownloadQueueClearFailed": "Failed to clear queue",
   "ToastEpisodeDownloadQueueClearSuccess": "Episode download queue cleared",
   "ToastEpisodeUpdateSuccess": "{0} episodes updated",
+  "ToastEpisodePubDateUpdateFailed": "Publish date is required",
   "ToastErrorCannotShare": "Cannot share natively on this device",
   "ToastFailedToLoadData": "Failed to load data",
   "ToastFailedToMatch": "Failed to match",