diff --git a/custom_components/afvalwijzer/sensor_custom.py b/custom_components/afvalwijzer/sensor_custom.py
index 7934a32..41d2faa 100755
--- a/custom_components/afvalwijzer/sensor_custom.py
+++ b/custom_components/afvalwijzer/sensor_custom.py
@@ -108,7 +108,7 @@ def _update_attributes_date(self, collection_date):
 
     def _update_attributes_non_date(self, value):
         self._state = str(value)
-        self._days_until_collection_date = self._default_label
+        self._days_until_collection_date = None
         self._device_class = None
 
     def _handle_value_error(self):
diff --git a/custom_components/afvalwijzer/sensor_provider.py b/custom_components/afvalwijzer/sensor_provider.py
index ca39091..2711116 100755
--- a/custom_components/afvalwijzer/sensor_provider.py
+++ b/custom_components/afvalwijzer/sensor_provider.py
@@ -125,7 +125,7 @@ def _update_attributes_date(self, collection_date):
 
     def _update_attributes_non_date(self, value):
         self._state = str(value)
-        self._days_until_collection_date = self._default_label
+        self._days_until_collection_date = None
         self._device_class = None
 
     def _update_collection_date_flags(self, collection_date_delta):