diff --git a/hassio/api/addons.py b/hassio/api/addons.py
index 2c10870d0..41e0767b3 100644
--- a/hassio/api/addons.py
+++ b/hassio/api/addons.py
@@ -291,7 +291,7 @@ class APIAddons(CoreSysAttributes):
             _LOGGER.warning("Protected flag changing for %s!", addon.slug)
             addon.protected = body[ATTR_PROTECTED]
 
-        addon.save_data()
+        addon.save_persist()
 
     @api_process
     async def stats(self, request: web.Request) -> Dict[str, Any]:
diff --git a/hassio/ingress.py b/hassio/ingress.py
index cc87b242b..83dda70b0 100644
--- a/hassio/ingress.py
+++ b/hassio/ingress.py
@@ -96,8 +96,6 @@ class Ingress(JsonConfig, CoreSysAttributes):
         valid = utcnow() + timedelta(minutes=15)
 
         self.sessions[session] = valid.timestamp()
-        self.save_data()
-
         return session
 
     def validate_session(self, session: str) -> bool:
diff --git a/tests/test_ingress.py b/tests/test_ingress.py
index 50f1d5de4..a1aaf570e 100644
--- a/tests/test_ingress.py
+++ b/tests/test_ingress.py
@@ -9,7 +9,6 @@ def test_session_handling(coresys):
     session = coresys.ingress.create_session()
     validate = coresys.ingress.sessions[session]
 
-    assert coresys.ingress.save_data.called
     assert session
     assert validate
 
@@ -22,6 +21,14 @@ def test_session_handling(coresys):
     assert not coresys.ingress.validate_session("invalid session")
 
 
+async def test_save_on_unload(coresys):
+    """Test called save on unload."""
+    coresys.ingress.create_session()
+    await coresys.ingress.unload()
+
+    assert coresys.ingress.save_data.called
+
+
 def test_dynamic_ports(coresys):
     """Test dyanmic port handling."""
     port_test1 = coresys.ingress.get_dynamic_port("test1")