diff --git a/utils/config.go b/utils/config.go
index e76cbed631..e4bcb0b85b 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -285,7 +285,7 @@ func ValidateLdapFilter(cfg *model.Config) *model.AppError {
 }
 
 func Desanitize(cfg *model.Config) {
-	if *cfg.LdapSettings.BindPassword == model.FAKE_SETTING {
+	if cfg.LdapSettings.BindPassword != nil && *cfg.LdapSettings.BindPassword == model.FAKE_SETTING {
 		*cfg.LdapSettings.BindPassword = *Cfg.LdapSettings.BindPassword
 	}