Better fallback for current monitor removal