diff --git a/src/Store/DoctrineDbalStore.php b/src/Store/DoctrineDbalStore.php
index 3725746fc..ca4bf8479 100644
--- a/src/Store/DoctrineDbalStore.php
+++ b/src/Store/DoctrineDbalStore.php
@@ -276,7 +276,7 @@ public function configureSchema(Schema $schema, Connection $connection): void
         $table->addColumn('aggregate', Types::STRING)
             ->setLength(255)
             ->setNotnull(true);
-        $table->addColumn('aggregate_id', Types::STRING)
+        $table->addColumn('aggregate_id', Types::GUID)
             ->setLength(36)
             ->setNotnull(true);
         $table->addColumn('playhead', Types::INTEGER)
@@ -299,6 +299,6 @@ public function configureSchema(Schema $schema, Connection $connection): void
 
         $table->setPrimaryKey(['id']);
         $table->addUniqueIndex(['aggregate', 'aggregate_id', 'playhead']);
-        $table->addIndex(['aggregate', 'aggregate_id', 'playhead', 'archived']);
+        //$table->addIndex(['aggregate', 'aggregate_id', 'playhead', 'archived']);
     }
 }