diff --git a/docs/swagger/definitions/SetShortUrlRedirectRule.json b/docs/swagger/definitions/SetShortUrlRedirectRule.json
index 00074acf..5ff6371c 100644
--- a/docs/swagger/definitions/SetShortUrlRedirectRule.json
+++ b/docs/swagger/definitions/SetShortUrlRedirectRule.json
@@ -15,7 +15,7 @@
         "properties": {
           "type": {
             "type": "string",
-            "enum": ["device", "language", "query-param", "ip-address"],
+            "enum": ["device", "language", "query-param", "ip-address", "geolocation-country-code"],
             "description": "The type of the condition, which will determine the logic used to match it"
           },
           "matchKey":  {
diff --git a/module/Core/src/RedirectRule/Model/RedirectConditionType.php b/module/Core/src/RedirectRule/Model/RedirectConditionType.php
index ed587ffa..73f11a27 100644
--- a/module/Core/src/RedirectRule/Model/RedirectConditionType.php
+++ b/module/Core/src/RedirectRule/Model/RedirectConditionType.php
@@ -2,6 +2,12 @@
 
 namespace Shlinkio\Shlink\Core\RedirectRule\Model;
 
+use Shlinkio\Shlink\Core\Model\DeviceType;
+use Shlinkio\Shlink\Core\Util\IpAddressUtils;
+
+use function Shlinkio\Shlink\Core\ArrayUtils\contains;
+use function Shlinkio\Shlink\Core\enumValues;
+
 enum RedirectConditionType: string
 {
     case DEVICE = 'device';
@@ -9,4 +15,35 @@ enum RedirectConditionType: string
     case QUERY_PARAM = 'query-param';
     case IP_ADDRESS = 'ip-address';
     case GEOLOCATION_COUNTRY_CODE = 'geolocation-country-code';
+
+    /**
+     * Tells if a value is valid for the condition type
+     */
+    public function isValid(string $value): bool
+    {
+        return match ($this) {
+            RedirectConditionType::DEVICE => contains($value, enumValues(DeviceType::class)),
+            // RedirectConditionType::LANGUAGE => TODO Validate at least format,
+            RedirectConditionType::IP_ADDRESS => IpAddressUtils::isStaticIpCidrOrWildcard($value),
+            RedirectConditionType::GEOLOCATION_COUNTRY_CODE => contains($value, [
+                'AF', 'AX', 'AL', 'DZ', 'AS', 'AD', 'AO', 'AI', 'AQ', 'AG', 'AR', 'AM', 'AW', 'AU', 'AT', 'AZ',
+                'BS', 'BH', 'BD', 'BB', 'BY', 'BE', 'BZ', 'BJ', 'BM', 'BT', 'BO', 'BQ', 'BA', 'BW', 'BV', 'BR',
+                'IO', 'BN', 'BG', 'BF', 'BI', 'CV', 'KH', 'CM', 'CA', 'KY', 'CF', 'TD', 'CL', 'CN', 'CX', 'CC',
+                'CO', 'KM', 'CG', 'CD', 'CK', 'CR', 'CI', 'HR', 'CU', 'CW', 'CY', 'CZ', 'DK', 'DJ', 'DM', 'DO',
+                'EC', 'EG', 'SV', 'GQ', 'ER', 'EE', 'SZ', 'ET', 'FK', 'FO', 'FJ', 'FI', 'FR', 'GF', 'PF', 'TF',
+                'GA', 'GM', 'GE', 'DE', 'GH', 'GI', 'GR', 'GL', 'GD', 'GP', 'GU', 'GT', 'GG', 'GN', 'GW', 'GY',
+                'HT', 'HM', 'VA', 'HN', 'HK', 'HU', 'IS', 'IN', 'ID', 'IR', 'IQ', 'IE', 'IM', 'IL', 'IT', 'JM',
+                'JP', 'JE', 'JO', 'KZ', 'KE', 'KI', 'KP', 'KR', 'KW', 'KG', 'LA', 'LV', 'LB', 'LS', 'LR', 'LY',
+                'LI', 'LT', 'LU', 'MO', 'MG', 'MW', 'MY', 'MV', 'ML', 'MT', 'MH', 'MQ', 'MR', 'MU', 'YT', 'MX',
+                'FM', 'MD', 'MC', 'MN', 'ME', 'MS', 'MA', 'MZ', 'MM', 'NA', 'NR', 'NP', 'NL', 'NC', 'NZ', 'NI',
+                'NE', 'NG', 'NU', 'NF', 'MK', 'MP', 'NO', 'OM', 'PK', 'PW', 'PS', 'PA', 'PG', 'PY', 'PE', 'PH',
+                'PN', 'PL', 'PT', 'PR', 'QA', 'RE', 'RO', 'RU', 'RW', 'BL', 'SH', 'KN', 'LC', 'MF', 'PM', 'VC',
+                'WS', 'SM', 'ST', 'SA', 'SN', 'RS', 'SC', 'SL', 'SG', 'SX', 'SK', 'SI', 'SB', 'SO', 'ZA', 'GS',
+                'SS', 'ES', 'LK', 'SD', 'SR', 'SJ', 'SE', 'CH', 'SY', 'TW', 'TJ', 'TZ', 'TH', 'TL', 'TG', 'TK',
+                'TO', 'TT', 'TN', 'TR', 'TM', 'TC', 'TV', 'UG', 'UA', 'AE', 'GB', 'US', 'UM', 'UY', 'UZ', 'VU',
+                'VE', 'VN', 'VG', 'VI', 'WF', 'EH', 'YE', 'ZM', 'ZW',
+            ]),
+            default => true,
+        };
+    }
 }
diff --git a/module/Core/src/RedirectRule/Model/Validation/RedirectRulesInputFilter.php b/module/Core/src/RedirectRule/Model/Validation/RedirectRulesInputFilter.php
index c2fee661..42520a97 100644
--- a/module/Core/src/RedirectRule/Model/Validation/RedirectRulesInputFilter.php
+++ b/module/Core/src/RedirectRule/Model/Validation/RedirectRulesInputFilter.php
@@ -9,12 +9,9 @@ use Laminas\InputFilter\InputFilter;
 use Laminas\Validator\Callback;
 use Laminas\Validator\InArray;
 use Shlinkio\Shlink\Common\Validation\InputFactory;
-use Shlinkio\Shlink\Core\Model\DeviceType;
 use Shlinkio\Shlink\Core\RedirectRule\Model\RedirectConditionType;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlInputFilter;
-use Shlinkio\Shlink\Core\Util\IpAddressUtils;
 
-use function Shlinkio\Shlink\Core\ArrayUtils\contains;
 use function Shlinkio\Shlink\Core\enumValues;
 
 /** @extends InputFilter<mixed> */
@@ -80,11 +77,9 @@ class RedirectRulesInputFilter extends InputFilter
 
         $value = InputFactory::basic(self::CONDITION_MATCH_VALUE, required: true);
         $value->getValidatorChain()->attach(new Callback(
-            fn (string $value, array $context) => match ($context[self::CONDITION_TYPE]) {
-                RedirectConditionType::DEVICE->value => contains($value, enumValues(DeviceType::class)),
-                RedirectConditionType::IP_ADDRESS->value => IpAddressUtils::isStaticIpCidrOrWildcard($value),
-                // RedirectConditionType::LANGUAGE->value => TODO,
-                default => true,
+            function (string $value, array $context): bool {
+                $conditionType = RedirectConditionType::tryFrom($context[self::CONDITION_TYPE]);
+                return $conditionType === null || $conditionType->isValid($value);
             },
         ));
         $redirectConditionInputFilter->add($value);