diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 3851e7606..a4c64b1f3 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -217,8 +217,8 @@ class Organisation < ApplicationRecord name: self[:name], start_date: created_at, end_date: changes.first&.dig(:start_date)&.yesterday, - status: changes.empty? ? "active" : "inactive", - ) + status: changes.empty? || Time.zone.now.to_date < changes.first[:start_date] ? "active" : "inactive", + ) changes end