diff --git a/lib/streaming_providers/base/provider_registry.py b/lib/streaming_providers/base/provider_registry.py
index f97a5b7..6e492ad 100644
--- a/lib/streaming_providers/base/provider_registry.py
+++ b/lib/streaming_providers/base/provider_registry.py
@@ -27,22 +27,22 @@ class ProviderMetadata:
         supports_multiple = self.plugin_class.supports_multiple_countries()
 
         if supports_multiple:
+            # Multi-country provider: include country in name
             self.name = f"{self.plugin_name}_{self.country}"
             self.is_multi_country = True
         else:
+            # Single-country provider
+            self.name = self.plugin_name
+
+            # Check if provider has an explicit single country
             supported_countries = self.plugin_class.get_static_supported_countries()
-            if len(supported_countries) == 1 and supported_countries[0] != "*":
-                # True single-country provider (e.g. HRTi hardcoded to "HR")
-                self.name = self.plugin_name
+            if len(supported_countries) == 1:
+                # Provider has exactly one supported country (e.g., HRTi with ["HR"])
+                # Use that country instead of the passed-in country
                 self.country = supported_countries[0].upper()
                 self.is_multi_country = False
-            elif supported_countries == ["*"]:
-                # Wildcard provider: name includes the runtime country (e.g. "discovery_de")
-                self.name = f"{self.plugin_name}_{self.country.lower()}"
-                self.is_multi_country = False
             else:
-                # Country-agnostic or empty list
-                self.name = self.plugin_name
+                # True single-country or country-agnostic (empty list)
                 self.is_multi_country = False
 
         # Rest of the method remains the same...
@@ -252,7 +252,11 @@ class ProviderRegistry:
                 continue
 
             if plugin_class.supports_multiple_countries():
-                for country in plugin_class.get_static_supported_countries():
+                country_list = plugin_class.get_static_supported_countries()
+                if country_list == ["*"]:
+                    # Wildcard provider: register one instance for the default country
+                    country_list = [default_country]
+                for country in country_list:
                     instance_name = f"{plugin_name}_{country}"
                     enabled = self._is_provider_enabled(plugin_name, country)
 
diff --git a/lib/streaming_providers/providers/discovery/provider.py b/lib/streaming_providers/providers/discovery/provider.py
index 6d2f552..e9ba061 100644
--- a/lib/streaming_providers/providers/discovery/provider.py
+++ b/lib/streaming_providers/providers/discovery/provider.py
@@ -301,18 +301,28 @@ class DiscoveryProvider(StreamingProvider):
             return self.token_info.get("anonymous", True)
         return True
 
-    def validate_country(self, country: str) -> bool:
+    @classmethod
+    def supports_multiple_countries(cls) -> bool:
+        """
+        Discovery+ uses a wildcard country list, but still registers one
+        instance per country — so the registry must treat it as multi-country
+        to produce names like ``discovery_de``.
+        """
+        return cls.SUPPORTED_COUNTRIES == ["*"]
+
+    @classmethod
+    def validate_country(cls, country: str) -> bool:
         """
         Override base validation.
 
-        Discovery+ supports all countries (SUPPORTED_COUNTRIES == "*"),
-        so any non-empty lowercase alpha-2 code is accepted.
-        The user's actual serving country is determined at runtime via
-        get_user_country().
+        With the wildcard sentinel any valid ISO-3166-1 alpha-2 code is
+        accepted.  The user's actual serving country is determined at runtime
+        via get_user_country().
         """
-        if self.SUPPORTED_COUNTRIES == ["*"]:
+        if cls.SUPPORTED_COUNTRIES == ["*"]:
             return bool(country and country.isalpha() and len(country) == 2)
-        return country.lower() in [c.lower() for c in self.SUPPORTED_COUNTRIES]
+        # Fallback to standard list-based check if constant is ever changed back
+        return country.lower() in [c.lower() for c in cls.SUPPORTED_COUNTRIES]
 
     def get_user_country(self) -> Optional[str]:
         """