Not when you are breaking your fast (too much insulin sensitivity) and not right before starting your new fast (will make you hungry faster).
Try to drink lemon water 30-60 minutes before as it can slow down e reduce your insulin spike. Another strategy is consuming carbs after a protein meal (same reason) or with fibers.