db: handle unchanged return_states better