diff --git a/src/Timestampable/Traits/Timestampable.php b/src/Timestampable/Traits/Timestampable.php
index e4b8623ac6..80a4ed67a1 100644
--- a/src/Timestampable/Traits/Timestampable.php
+++ b/src/Timestampable/Traits/Timestampable.php
@@ -17,12 +17,12 @@
 trait Timestampable
 {
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     protected $createdAt;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     protected $updatedAt;
 
@@ -41,7 +41,7 @@ public function setCreatedAt(\DateTime $createdAt)
     /**
      * Returns createdAt.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getCreatedAt()
     {
@@ -63,7 +63,7 @@ public function setUpdatedAt(\DateTime $updatedAt)
     /**
      * Returns updatedAt.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getUpdatedAt()
     {
diff --git a/src/Timestampable/Traits/TimestampableDocument.php b/src/Timestampable/Traits/TimestampableDocument.php
index fbbf2e6bce..7ffa5b1f00 100644
--- a/src/Timestampable/Traits/TimestampableDocument.php
+++ b/src/Timestampable/Traits/TimestampableDocument.php
@@ -21,7 +21,7 @@
 trait TimestampableDocument
 {
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      * @Gedmo\Timestampable(on="create")
      * @ODM\Field(type="date")
      */
@@ -30,7 +30,7 @@ trait TimestampableDocument
     protected $createdAt;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      * @Gedmo\Timestampable(on="update")
      * @ODM\Field(type="date")
      */
@@ -53,7 +53,7 @@ public function setCreatedAt(\DateTime $createdAt)
     /**
      * Returns createdAt.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getCreatedAt()
     {
@@ -75,7 +75,7 @@ public function setUpdatedAt(\DateTime $updatedAt)
     /**
      * Returns updatedAt.
      *
-     * @return \Datetime
+     * @return \Datetime|null
      */
     public function getUpdatedAt()
     {
diff --git a/src/Timestampable/Traits/TimestampableEntity.php b/src/Timestampable/Traits/TimestampableEntity.php
index 0186287d2f..ac809a7c81 100644
--- a/src/Timestampable/Traits/TimestampableEntity.php
+++ b/src/Timestampable/Traits/TimestampableEntity.php
@@ -21,7 +21,7 @@
 trait TimestampableEntity
 {
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      * @Gedmo\Timestampable(on="create")
      * @ORM\Column(type="datetime")
      */
@@ -30,7 +30,7 @@ trait TimestampableEntity
     protected $createdAt;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      * @Gedmo\Timestampable(on="update")
      * @ORM\Column(type="datetime")
      */
@@ -53,7 +53,7 @@ public function setCreatedAt(\DateTime $createdAt)
     /**
      * Returns createdAt.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getCreatedAt()
     {
@@ -75,7 +75,7 @@ public function setUpdatedAt(\DateTime $updatedAt)
     /**
      * Returns updatedAt.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getUpdatedAt()
     {