[FIX] Unset POPUPs on disabled API
Merge pull request #1904 from MPOS/popup-cleanup

[FIX] Unset POPUPs on disabled API