Fix saving active endpoint