diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index 1012a632d..62e68fb42 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -1409,10 +1409,10 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque
 		} else if ldapConn == nil {
 			ldap.Status = "Not Configured"
 		} else {
+			// Close ldap connection to avoid leaks.
+			ldapConn.Close()
 			ldap.Status = "online"
 		}
-		// Close ldap connection to avoid leaks.
-		defer ldapConn.Close()
 	}
 
 	log, audit := fetchLoggerInfo(cfg)