diff --git a/src/trackbert/classes/core.py b/src/trackbert/classes/core.py
index 021cc8f..a9cff89 100644
--- a/src/trackbert/classes/core.py
+++ b/src/trackbert/classes/core.py
@@ -74,9 +74,10 @@ class Core:
         logging.debug("Finding external notifiers")
         notifiers = []
 
-        for entry_point in importlib.metadata.entry_points().get(
-            "trackbert.notifiers", []
-        ):
+        for entry_point in importlib.metadata.entry_points():
+            if entry_point.group != "trackbert.notifiers":
+                continue
+
             logging.debug(f"Considering external notifier {entry_point.name}")
 
             try:
@@ -149,9 +150,10 @@ class Core:
 
         providers = []
 
-        for entry_point in importlib.metadata.entry_points().get(
-            "trackbert.providers", []
-        ):
+        for entry_point in importlib.metadata.entry_points():
+            if entry_point.group != "trackbert.providers":
+                continue
+
             logging.debug(f"Considering external provider {entry_point.name}")
 
             try: