diff --git a/custom_components/ge_home/entities/common/ge_erd_entity.py b/custom_components/ge_home/entities/common/ge_erd_entity.py
index 7b9b67e..a23a36c 100644
--- a/custom_components/ge_home/entities/common/ge_erd_entity.py
+++ b/custom_components/ge_home/entities/common/ge_erd_entity.py
@@ -69,7 +69,7 @@ class GeErdEntity(GeEntity):
         if self.erd_code_class == ErdCodeClass.NON_ZERO_TEMPERATURE:
             return f"{value}" if value else ""
         if self.erd_code_class == ErdCodeClass.TIMER or isinstance(value, timedelta):
-            return str(value)[:-3] if value else ""
+            return str(value)[:-3] if value else "Off"
         if value is None:
             return None
         return self.appliance.stringify_erd_value(value, **kwargs)
diff --git a/custom_components/ge_home/entities/common/ge_erd_sensor.py b/custom_components/ge_home/entities/common/ge_erd_sensor.py
index 04de12a..bd54c03 100644
--- a/custom_components/ge_home/entities/common/ge_erd_sensor.py
+++ b/custom_components/ge_home/entities/common/ge_erd_sensor.py
@@ -114,8 +114,6 @@ class GeErdSensor(GeErdEntity, Entity):
             return DEVICE_CLASS_POWER
         if self.erd_code_class == ErdCodeClass.ENERGY:
             return DEVICE_CLASS_ENERGY
-        if self.erd_code_class == ErdCodeClass.TIMER:
-            return DEVICE_CLASS_TIMESTAMP
 
         return None
 
diff --git a/custom_components/ge_home/services.yaml b/custom_components/ge_home/services.yaml
index 7ec2fd0..b35b335 100644
--- a/custom_components/ge_home/services.yaml
+++ b/custom_components/ge_home/services.yaml
@@ -7,7 +7,6 @@ set_timer:
     entity:
       integration: "ge_home"
       domain: "sensor"
-      device_class: "timestamp"
   fields:
     duration:
       name: Duration
@@ -28,4 +27,3 @@ clear_timer:
     entity:
       integration: "ge_home"
       domain: "sensor"
-      device_class: "timestamp"