diff --git a/lib/sequent/core/tenant_event_store.rb b/lib/sequent/core/tenant_event_store.rb
index <HASH>..<HASH> 100644
--- a/lib/sequent/core/tenant_event_store.rb
+++ b/lib/sequent/core/tenant_event_store.rb
@@ -8,11 +8,14 @@ module Sequent
       def replay_events_for(organization_id)
         replay_events do
           @event_record_class.connection.select_all(%Q{
-SELECT event_type, event_json
-  FROM #{quote_table_name @event_record_class.table_name}
- WHERE organization_id = #{quote organization_id}
-   AND event_type <> #{quote @snapshot_event_class.name}
- ORDER BY id
+SELECT events.event_type, events.event_json
+  FROM #{quote_table_name @event_record_class.table_name} aggregates
+       JOIN #{quote_table_name @event_record_class.table_name} events ON aggregates.aggregate_id = events.aggregate_id
+ WHERE aggregates.organization_id = #{quote organization_id}
+   AND aggregates.sequence_number = 1
+   AND aggregates.event_type <> #{quote @snapshot_event_class.name}
+   AND events.event_type <> #{quote @snapshot_event_class.name}
+ ORDER BY events.id
 })
         end
       end
Fix replaying events for organization

Include all events for all aggregates associated with the
organization (do not skip events that do not have `organization_id`
set).