diff --git a/internal/configuration/sources/env/serverselection.go b/internal/configuration/sources/env/serverselection.go
index df7ae6f8..33142bb8 100644
--- a/internal/configuration/sources/env/serverselection.go
+++ b/internal/configuration/sources/env/serverselection.go
@@ -25,17 +25,14 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 		return ss, err
 	}
 
-	countriesCSV := os.Getenv("COUNTRY")
-	if vpnProvider == constants.Cyberghost && countriesCSV == "" {
-		// Retro-compatibility
-		countriesCSV = os.Getenv("REGION")
-		if countriesCSV != "" {
+	ss.Countries = envToCSV("COUNTRY")
+	if vpnProvider == constants.Cyberghost && len(ss.Countries) == 0 {
+		// Retro-compatibility for Cyberghost using the REGION variable
+		ss.Countries = envToCSV("REGION")
+		if len(ss.Countries) > 0 {
 			r.onRetroActive("REGION", "COUNTRY")
 		}
 	}
-	if countriesCSV != "" {
-		ss.Countries = lowerAndSplit(countriesCSV)
-	}
 
 	ss.Regions = envToCSV("REGION")
 	ss.Cities = envToCSV("CITY")