You are technically correct, but the practical thing to do is abandon the term when it’s not forced/tragic. No reason to rehabilitate the term.
And a fun but important fact is that genetic and heritable diseases are not necessarily the same. I went too long as a clinician conflating the two: veritasint.com/…/difference-between-genetic-and-h… (corporate link but correct and well written)