[FIX] Prevent undesired undefined in DB