Yes, that is the correct and recommended procedure.
I had my mass air flow sensor changed, at the factory, which apart from one recurrence resolved the wild rev counter readings, I just have the situation where when I switch off and then on again after a run the needle stops at about 1000 rpm / idle speed.
I will probably ask Williams to look at this for me.
I am thinking a replacement rev counter may be the answer.
I have the same problem on a 2013 car