Fix for null value
rollback db setting