Excellent suggestion. Alternatively, within the same workout, if you do something like a "strength set" followed by ... something else (a higher rep set), you could do all your warmups for the strength set without straps, do the strength set with straps, and then do the rep-out set without them. I did this for BB Bent Over Rows and rack pulls, and now I don't use straps at all. For deadlifts I just ditched the straps and stopped whenever my grip went out. It'll probably improve your form to do this as well.