diff --git a/spine_items/data_store/data_store.py b/spine_items/data_store/data_store.py
index 5e433866..09d67ed5 100644
--- a/spine_items/data_store/data_store.py
+++ b/spine_items/data_store/data_store.py
@@ -70,16 +70,14 @@ def __init__(self, name, description, x, y, toolbox, project, url):
         self._purge_settings = None
         self._purge_dialog = None
         self._database_validator = DatabaseConnectionValidator(self)
-        db_map = self.get_db_map_for_ds()
-        # Notify db manager about the Data Stores in the project, so it can notify about the dirtiness of them
-        self._toolbox.db_mngr.add_data_store_db_map(db_map, self)
+        self._toolbox.db_mngr.database_clean_changed.connect(self._set_database_clean)
 
-    def get_db_map_for_ds(self):
+    def get_db_map(self):
         """Returns the db map for the Data Store"""
         sa_url = self.sql_alchemy_url()
-        if sa_url is not None:
-            return self._toolbox.db_mngr.get_db_map(sa_url, self._logger, codename=self.name)
-        return None
+        if sa_url is None:
+            return None
+        return self._toolbox.db_mngr.get_db_map(sa_url, self._logger, codename=self.name)
 
     @staticmethod
     def item_type():
@@ -372,13 +370,20 @@ def _check_notifications(self):
         self._database_validator.validate_url(
             self._url["dialect"], sa_url, self._set_invalid_url_notification, self._accept_url
         )
-        db_map = self.get_db_map_for_ds()
-        if db_map:
-            clean = not self._toolbox.db_mngr.is_dirty(db_map)
-            self.notify_about_dirtiness(clean)
 
-    @Slot(bool)
-    def notify_about_dirtiness(self, clean):
+    @Slot(object, bool)
+    def _set_database_clean(self, db_map, clean):
+        """Updates database cleanliness status.
+
+        Args:
+            db_map (DatabaseMapping): database mapping
+            clean (bool): True if database is clean, False otherwise
+        """
+        if db_map is not self.get_db_map():
+            return
+        self._notify_about_dirtiness(clean)
+
+    def _notify_about_dirtiness(self, clean):
         """
         Handles the notification for the dirtiness of the Data Store
 
@@ -422,7 +427,10 @@ def _accept_url(self, url):
             self._resources_to_predecessors_changed()
             self._resources_to_successors_changed()
         self._update_actions_enabled()
-        self._toolbox.db_mngr.update_data_store_db_maps()
+        db_map = self.get_db_map()
+        if db_map:
+            clean = not self._toolbox.db_mngr.is_dirty(db_map)
+            self._notify_about_dirtiness(clean)
 
     def is_url_validated(self):
         """Tests whether the URL has been validated.
@@ -485,7 +493,6 @@ def rename(self, new_name, rename_data_dir_message):
         """See base class."""
         old_data_dir = os.path.abspath(self.data_dir)  # Old data_dir before rename
         old_name = self.name
-        self.rename_data_store_in_db_mngr(old_name)  # Notify db manager about the rename
         if not super().rename(new_name, rename_data_dir_message):
             return False
         # If dialect is sqlite and db line edit refers to a file in the old data_dir, db line edit needs updating
@@ -534,18 +541,8 @@ def resources_for_direct_predecessors(self):
         """See base class."""
         return self.resources_for_direct_successors()
 
-    def rename_data_store_in_db_mngr(self, old_name):
-        """Renames the Data Store in the used db manager"""
-        db_map = self.get_db_map_for_ds()
-        self._toolbox.db_mngr.update_data_store_db_maps()
-        index = next((i for i, store in enumerate(self._toolbox.db_mngr.data_stores[db_map]) if store.name == old_name))
-        if index is not None:
-            self._toolbox.db_mngr.data_stores[db_map][index] = self
-
     def tear_down(self):
         """See base class"""
+        self._toolbox.db_mngr.database_clean_changed.disconnect(self._set_database_clean)
         self._database_validator.wait_for_finish()
-        db_map = self.get_db_map_for_ds()
-        if db_map is not None:
-            self._toolbox.db_mngr.remove_data_store_db_map(db_map, self)
         super().tear_down()
diff --git a/tests/data_store/test_dataStore.py b/tests/data_store/test_dataStore.py
index 386fc146..ccfbc8df 100644
--- a/tests/data_store/test_dataStore.py
+++ b/tests/data_store/test_dataStore.py
@@ -123,7 +123,6 @@ def test_rename(self):
         self.assertTrue(os.path.exists(url["database"]))
 
     def test_dirty_db_notification(self):
-        """Tests renaming a Data Store with an existing sqlite db in it's data_dir."""
         temp_path = self.create_temp_db()
         url = {"dialect": "sqlite", "database": temp_path}
         self.ds._url = self.ds.parse_url(url)
@@ -132,15 +131,13 @@ def test_dirty_db_notification(self):
         self.ds._check_notifications()
         self.assertEqual([], self.ds.get_icon().exclamation_icon._notifications)
         # Check that there is a warning about uncommitted changes
-        db_map = self.ds.get_db_map_for_ds()
+        db_map = self.ds.get_db_map()
         self._toolbox.db_mngr.add_entity_classes({db_map: [{"name": "my_object_class"}]})
-        self.ds._check_notifications()
         self.assertEqual(
             [f"{self.ds.name} has uncommitted changes"], self.ds.get_icon().exclamation_icon._notifications
         )
         # Check that the warning disappears after committing the changes
         self._toolbox.db_mngr.commit_session("Added entity classes", db_map)
-        self.ds._check_notifications()
         self.assertEqual([], self.ds.get_icon().exclamation_icon._notifications)