diff --git a/homeassistant/components/picnic/sensor.py b/homeassistant/components/picnic/sensor.py
index e7a69e0bf02..507ab82e8e2 100644
--- a/homeassistant/components/picnic/sensor.py
+++ b/homeassistant/components/picnic/sensor.py
@@ -17,10 +17,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
 from .const import (
@@ -44,6 +41,7 @@ from .const import (
     SENSOR_SELECTED_SLOT_MIN_ORDER_VALUE,
     SENSOR_SELECTED_SLOT_START,
 )
+from .coordinator import PicnicUpdateCoordinator
 
 
 @dataclass
@@ -237,7 +235,7 @@ async def async_setup_entry(
     )
 
 
-class PicnicSensor(SensorEntity, CoordinatorEntity):
+class PicnicSensor(SensorEntity, CoordinatorEntity[PicnicUpdateCoordinator]):
     """The CoordinatorEntity subclass representing Picnic sensors."""
 
     _attr_has_entity_name = True
@@ -246,7 +244,7 @@ class PicnicSensor(SensorEntity, CoordinatorEntity):
 
     def __init__(
         self,
-        coordinator: DataUpdateCoordinator[Any],
+        coordinator: PicnicUpdateCoordinator,
         config_entry: ConfigEntry,
         description: PicnicSensorEntityDescription,
     ) -> None:
diff --git a/homeassistant/components/picnic/services.py b/homeassistant/components/picnic/services.py
index fa00037462d..b44d4dd5a62 100644
--- a/homeassistant/components/picnic/services.py
+++ b/homeassistant/components/picnic/services.py
@@ -77,8 +77,11 @@ async def handle_add_product(
     )
 
 
-def product_search(api_client: PicnicAPI, product_name: str) -> None | str:
+def product_search(api_client: PicnicAPI, product_name: str | None) -> None | str:
     """Query the api client for the product name."""
+    if product_name is None:
+        return None
+
     search_result = api_client.search(product_name)
 
     if not search_result or "items" not in search_result[0]:
diff --git a/homeassistant/components/picnic/todo.py b/homeassistant/components/picnic/todo.py
index 389909ca06e..47b9685c9ec 100644
--- a/homeassistant/components/picnic/todo.py
+++ b/homeassistant/components/picnic/todo.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, cast
+from typing import cast
 
 from homeassistant.components.todo import (
     TodoItem,
@@ -14,12 +14,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_COORDINATOR, DOMAIN
+from .coordinator import PicnicUpdateCoordinator
 from .services import product_search
 
 _LOGGER = logging.getLogger(__name__)
@@ -36,7 +34,7 @@ async def async_setup_entry(
     async_add_entities([PicnicCart(hass, picnic_coordinator, config_entry)])
 
 
-class PicnicCart(TodoListEntity, CoordinatorEntity):
+class PicnicCart(TodoListEntity, CoordinatorEntity[PicnicUpdateCoordinator]):
     """A Picnic Shopping Cart TodoListEntity."""
 
     _attr_has_entity_name = True
@@ -47,7 +45,7 @@ class PicnicCart(TodoListEntity, CoordinatorEntity):
     def __init__(
         self,
         hass: HomeAssistant,
-        coordinator: DataUpdateCoordinator[Any],
+        coordinator: PicnicUpdateCoordinator,
         config_entry: ConfigEntry,
     ) -> None:
         """Initialize PicnicCart."""