Base: Fix controller being polled twice on first load