diff --git a/src/elements/Entry.php b/src/elements/Entry.php
index 4c90b044a40..d34eb413e60 100644
--- a/src/elements/Entry.php
+++ b/src/elements/Entry.php
@@ -3012,7 +3012,10 @@ private function maybeSetDefaultAttributes(): void
         if (
             !$this->postDate &&
             $this->enabled &&
-            in_array($this->scenario, [self::SCENARIO_LIVE, self::SCENARIO_DEFAULT])
+            (
+                in_array($this->scenario, [self::SCENARIO_LIVE, self::SCENARIO_DEFAULT]) ||
+                (!$this->getIsDraft() && !$this->getIsRevision())
+            )
         ) {
             // Default the post date to the current date/time
             $this->postDate = new DateTime();