diff --git a/boneio/helper/stats.py b/boneio/helper/stats.py
index 2697804..32f3d85 100644
--- a/boneio/helper/stats.py
+++ b/boneio/helper/stats.py
@@ -129,7 +129,7 @@ def __init__(
     ) -> None:
         self._update_function = update_function
         self._static_data = static_data
-        self._state = None
+        self._state = {}
         self._type = type
         self._manager_callback = manager_callback
         self._loop = asyncio.get_event_loop()
@@ -143,7 +143,7 @@ async def async_update(self, time: datetime) -> None:
     @property
     def state(self) -> dict:
         if self._static_data:
-            return {**self._static_data, self._type: self._state}
+            return {**self._static_data, **self._state}
         return self._state
 
 
@@ -162,6 +162,7 @@ def __init__(
     ) -> None:
         """Initialize HostData."""
         self._hostname = socket.gethostname()
+        self._temp_sensor = temp_sensor
         host_stats = {
             NETWORK: {"f": get_network_info, "update_interval": TimePeriod(seconds=60)},
             CPU: {"f": get_cpu_info, "update_interval": TimePeriod(seconds=5)},
@@ -169,7 +170,10 @@ def __init__(
             MEMORY: {"f": get_memory_info, "update_interval": TimePeriod(seconds=10)},
             SWAP: {"f": get_swap_info, "update_interval": TimePeriod(seconds=60)},
             UPTIME: {
-                "f": get_uptime,
+                "f": lambda: {
+                    "uptime": get_uptime(),
+                    "temp": f"{self._temp_sensor.state} C"
+                } if self._temp_sensor else {"uptime": get_uptime() },
                 "static": {HOST: self._hostname, "version": __version__},
                 "update_interval": TimePeriod(seconds=30),
             },
@@ -186,7 +190,6 @@ def __init__(
                 type=k,
                 update_interval=_v["update_interval"],
             )
-        self._temp_sensor = temp_sensor
         self._output = output
         self._callback = callback
         self._loop = asyncio.get_running_loop()
diff --git a/boneio/version.py b/boneio/version.py
index 2175ff8..b96e683 100644
--- a/boneio/version.py
+++ b/boneio/version.py
@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.6.1"
+__version__ = "0.6.2"