diff --git a/cmd/setup/11.sql b/cmd/setup/11.sql
index 28b49e47473..39f3e8cb02e 100644
--- a/cmd/setup/11.sql
+++ b/cmd/setup/11.sql
@@ -1 +1,5 @@
-ALTER TABLE eventstore.events ADD COLUMN created_at TIMESTAMPTZ /*NOT NULL*/ DEFAULT clock_timestamp();
\ No newline at end of file
+ALTER TABLE eventstore.events ADD COLUMN created_at TIMESTAMPTZ;
+
+UPDATE eventstore.events SET created_at = creation_date WHERE created_at IS NULL;
+
+ALTER TABLE eventstore.events ALTER COLUMN created_at SET NOT NULL DEFAULT clock_timestamp();
\ No newline at end of file