diff --git a/homeassistant/components/netatmo/data_handler.py b/homeassistant/components/netatmo/data_handler.py
index b4be2a147f7..1a322f8d8db 100644
--- a/homeassistant/components/netatmo/data_handler.py
+++ b/homeassistant/components/netatmo/data_handler.py
@@ -252,7 +252,7 @@ class NetatmoDataHandler:
         self, signal_name: str, update_callback: CALLBACK_TYPE | None
     ) -> None:
         """Unsubscribe from publisher."""
-        if update_callback in self.publisher[signal_name].subscriptions:
+        if update_callback not in self.publisher[signal_name].subscriptions:
             return
 
         self.publisher[signal_name].subscriptions.remove(update_callback)
@@ -288,6 +288,9 @@ class NetatmoDataHandler:
                 person.entity_id: person.pseudo for person in home.persons.values()
             }
 
+        await self.unsubscribe(WEATHER, None)
+        await self.unsubscribe(AIR_CARE, None)
+
     def setup_air_care(self) -> None:
         """Set up home coach/air care modules."""
         for module in self.account.modules.values():
diff --git a/homeassistant/components/netatmo/netatmo_entity_base.py b/homeassistant/components/netatmo/netatmo_entity_base.py
index d0359d739fd..c434d370e27 100644
--- a/homeassistant/components/netatmo/netatmo_entity_base.py
+++ b/homeassistant/components/netatmo/netatmo_entity_base.py
@@ -63,9 +63,11 @@ class NetatmoBase(Entity):
                     publisher["name"], signal_name, self.async_update_callback
                 )
 
-            for sub in self.data_handler.publisher[signal_name].subscriptions:
-                if sub is None:
-                    await self.data_handler.unsubscribe(signal_name, None)
+            if any(
+                sub is None
+                for sub in self.data_handler.publisher[signal_name].subscriptions
+            ):
+                await self.data_handler.unsubscribe(signal_name, None)
 
         registry = dr.async_get(self.hass)
         if device := registry.async_get_device({(DOMAIN, self._id)}):
diff --git a/tests/components/netatmo/test_camera.py b/tests/components/netatmo/test_camera.py
index 027b0907d50..beb91c7565e 100644
--- a/tests/components/netatmo/test_camera.py
+++ b/tests/components/netatmo/test_camera.py
@@ -472,7 +472,7 @@ async def test_setup_component_no_devices(hass, config_entry):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
-        assert fake_post_hits == 9
+        assert fake_post_hits == 11
 
 
 async def test_camera_image_raises_exception(hass, config_entry, requests_mock):
diff --git a/tests/components/netatmo/test_init.py b/tests/components/netatmo/test_init.py
index 187a89afeb6..65cc991ec67 100644
--- a/tests/components/netatmo/test_init.py
+++ b/tests/components/netatmo/test_init.py
@@ -110,7 +110,7 @@ async def test_setup_component_with_config(hass, config_entry):
 
         await hass.async_block_till_done()
 
-        assert fake_post_hits == 8
+        assert fake_post_hits == 10
         mock_impl.assert_called_once()
         mock_webhook.assert_called_once()