diff --git a/src/Repository/DefaultRepository.php b/src/Repository/DefaultRepository.php
index ce475ba4c..c95ab5b36 100644
--- a/src/Repository/DefaultRepository.php
+++ b/src/Repository/DefaultRepository.php
@@ -223,9 +223,7 @@ static function (object $event) use ($aggregateName, $aggregateId, &$playhead, $
                         ->withAggregateName($aggregateName)
                         ->withAggregateId($aggregateId)
                         ->withPlayhead(++$playhead)
-                        ->withRecordedOn($clock->now())
-                        ->withArchived(false)
-                        ->withNewStreamStart(false);
+                        ->withRecordedOn($clock->now());
 
                     if ($messageDecorator) {
                         return $messageDecorator($message);
diff --git a/src/Store/DoctrineDbalStore.php b/src/Store/DoctrineDbalStore.php
index ef56d8fd8..bc36d251b 100644
--- a/src/Store/DoctrineDbalStore.php
+++ b/src/Store/DoctrineDbalStore.php
@@ -160,18 +160,28 @@ function (Connection $connection) use ($messages): void {
 
                         $parameters[] = $message->recordedOn();
                         $types[$offset + 5] = $dateTimeType;
-
-                        $parameters[] = $message->newStreamStart();
-                        $types[$offset + 6] = $booleanType;
-
-                        $parameters[] = $message->archived();
-                        $types[$offset + 7] = $booleanType;
-
-                        $parameters[] = $message->customHeaders();
-                        $types[$offset + 8] = $jsonType;
                     } catch (HeaderNotFound $e) {
                         throw new MissingDataForStorage($e->name, $e);
                     }
+
+                    try {
+                        $newStreamStart = $message->newStreamStart();
+                    } catch (HeaderNotFound) {
+                        $newStreamStart = false;
+                    }
+                    $parameters[] = $newStreamStart;
+                    $types[$offset + 6] = $booleanType;
+
+                    try {
+                        $archived = $message->archived();
+                    } catch (HeaderNotFound) {
+                        $archived = false;
+                    }
+                    $parameters[] = $archived;
+                    $types[$offset + 7] = $booleanType;
+
+                    $parameters[] = $message->customHeaders();
+                    $types[$offset + 8] = $jsonType;
                 }
 
                 $query = sprintf(
diff --git a/tests/Integration/Store/StoreTest.php b/tests/Integration/Store/StoreTest.php
index 660c5a58f..269852aab 100644
--- a/tests/Integration/Store/StoreTest.php
+++ b/tests/Integration/Store/StoreTest.php
@@ -53,16 +53,12 @@ public function testSave(): void
                 ->withAggregateName('profile')
                 ->withAggregateId('test')
                 ->withPlayhead(1)
-                ->withRecordedOn(new DateTimeImmutable('2020-01-01 00:00:00'))
-                ->withArchived(false)
-                ->withNewStreamStart(false),
+                ->withRecordedOn(new DateTimeImmutable('2020-01-01 00:00:00')),
             Message::create(new ProfileCreated(ProfileId::fromString('test'), 'test'))
                 ->withAggregateName('profile')
                 ->withAggregateId('test')
                 ->withPlayhead(2)
-                ->withRecordedOn(new DateTimeImmutable('2020-01-02 00:00:00'))
-                ->withArchived(false)
-                ->withNewStreamStart(false),
+                ->withRecordedOn(new DateTimeImmutable('2020-01-02 00:00:00')),
         ];
 
         $this->store->save(...$messages);
@@ -97,9 +93,7 @@ public function testLoad(): void
             ->withAggregateName('profile')
             ->withAggregateId('test')
             ->withPlayhead(1)
-            ->withRecordedOn(new DateTimeImmutable('2020-01-01 00:00:00'))
-            ->withArchived(false)
-            ->withNewStreamStart(false);
+            ->withRecordedOn(new DateTimeImmutable('2020-01-01 00:00:00'));
 
         $this->store->save($message);
 
@@ -107,6 +101,14 @@ public function testLoad(): void
 
         self::assertSame(1, $stream->index());
         self::assertSame(0, $stream->position());
-        self::assertEquals($message, $stream->current());
+
+        $loadedMessage = $stream->current();
+
+        self::assertNotSame($message, $loadedMessage);
+        self::assertEquals($message->aggregateId(), $loadedMessage->aggregateId());
+        self::assertEquals($message->aggregateName(), $loadedMessage->aggregateName());
+        self::assertEquals($message->playhead(), $loadedMessage->playhead());
+        self::assertEquals($message->event(), $loadedMessage->event());
+        self::assertEquals($message->recordedOn(), $loadedMessage->recordedOn());
     }
 }
diff --git a/tests/Unit/Outbox/DoctrineOutboxStoreTest.php b/tests/Unit/Outbox/DoctrineOutboxStoreTest.php
index ed0a80756..2e89a9565 100644
--- a/tests/Unit/Outbox/DoctrineOutboxStoreTest.php
+++ b/tests/Unit/Outbox/DoctrineOutboxStoreTest.php
@@ -34,9 +34,7 @@ public function testSaveOutboxMessage(): void
             ->withAggregateName('profile')
             ->withAggregateId('1')
             ->withPlayhead(1)
-            ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false);
+            ->withRecordedOn($recordedOn);
 
         $innerMockedConnection = $this->prophesize(Connection::class);
         $innerMockedConnection->insert(
@@ -72,8 +70,6 @@ public function testMarkOutboxMessageConsumed(): void
             ->withAggregateId('1')
             ->withPlayhead(1)
             ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false)
             ->withHeader(DoctrineOutboxStore::HEADER_OUTBOX_IDENTIFIER, 42);
 
         $innerMockedConnection = $this->prophesize(Connection::class);
@@ -108,9 +104,7 @@ public function testMarkOutboxMessageConsumedHeaderMissing(): void
             ->withAggregateName('profile')
             ->withAggregateId('1')
             ->withPlayhead(1)
-            ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false);
+            ->withRecordedOn($recordedOn);
 
         $innerMockedConnection = $this->prophesize(Connection::class);
         $innerMockedConnection->delete(
@@ -147,8 +141,6 @@ public function testMarkOutboxMessageConsumedHeaderInvalid(): void
             ->withAggregateId('1')
             ->withPlayhead(1)
             ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false)
             ->withHeader(DoctrineOutboxStore::HEADER_OUTBOX_IDENTIFIER, 'asd');
 
         $innerMockedConnection = $this->prophesize(Connection::class);
@@ -254,8 +246,6 @@ public function testRetrieveOutboxMessages(): void
             ->withAggregateId('1')
             ->withPlayhead(1)
             ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false)
             ->withHeader(DoctrineOutboxStore::HEADER_OUTBOX_IDENTIFIER, 42);
 
         $queryBuilder = $this->prophesize(QueryBuilder::class);
diff --git a/tests/Unit/Store/DoctrineDbalStoreTest.php b/tests/Unit/Store/DoctrineDbalStoreTest.php
index 3a164d749..cef4de4a2 100644
--- a/tests/Unit/Store/DoctrineDbalStoreTest.php
+++ b/tests/Unit/Store/DoctrineDbalStoreTest.php
@@ -201,9 +201,7 @@ public function testSaveWithOneEvent(): void
             ->withAggregateName('profile')
             ->withAggregateId('1')
             ->withPlayhead(1)
-            ->withRecordedOn($recordedOn)
-            ->withNewStreamStart(false)
-            ->withArchived(false);
+            ->withRecordedOn($recordedOn);
 
         $innerMockedConnection = $this->prophesize(Connection::class);