Fix return config if key is None