Issues with repetitive replies on expand button click

[kelv (Kelvin T)]

@TethysPlex Thanks for addressing the comments and your contribution! I’ve approved and merged the PR