[add] Forced state clearing on drop