This was the first time I had ever cleaned the flat. Right tense?

I write in the past and I’m not sure whether it’s:

1. This was the first time I had ever cleaned the flat.
2. This had been the first time I had ever cleaned the flat.

In the present it would be: This is the first time I have ever cleaned the flat.

I’m not sure how to express it when writing in the past