GGUGPDEV-9: Bugfix for saving empty value