diff --git a/__init__.py b/__init__.py
index 29798ef2..13cee624 100644
--- a/__init__.py
+++ b/__init__.py
@@ -104,7 +104,12 @@ def _register_tracker_entities(self) -> None:
 
             with open(self.tracker_file, 'w', encoding='utf8') as voc_file:
                 voc_file.write('\n'.join(entities))
-            self.register_entity_file(self.tracker_file)
+
+            # Workaround: If https://github.com/MycroftAI/mycroft-core/pull/3101
+            # will be merged, next two lines could be changed to proper usage
+            # self.register_entity_file(self.tracker_file)
+            name = f"{self.skill_id}:tracker"
+            self.intent_service.register_padatious_entity(name, self.tracker_file)
 
     def initialize(self) -> None:
         """Initialize skill, set language and priority."""