After Finish Swim Fenix 5 says can't find Garmin HR Swim data

I had a Garmin HR swim (chest strap monitor) that I no longer use (or own) when doing swims. And, I have removed it from the list of Garmin Devices in the Garmin Connect app. But, when I am finished with a pool swim, my Fenix 5 always says unable to locate HR Swim data. It hesitates for a long time looking for the HR Swim data. And, finally prompts me if I want to skip adding the data. Well of course I do since I am not wearing it . . . Is there a way to remove from my Fenix 5 any remembrance of me previously having a Garmin HR Swim? Small annoyance. But, never the less still an annoyance. Thanks in advance for your help.