diff --git a/pyrekordbox/db6/registry.py b/pyrekordbox/db6/registry.py
index 4dd50ef..7189815 100644
--- a/pyrekordbox/db6/registry.py
+++ b/pyrekordbox/db6/registry.py
@@ -119,9 +119,11 @@ def disabled(cls):
         ...     print(registry.__enabled__)
         False
         """
+        enabled = cls.__enabled__
         cls.disable_tracking()
         yield cls
-        cls.enable_tracking()
+        if enabled:
+            cls.enable_tracking()
 
     def get_registries(self):
         """Returns all agent registries.