diff --git a/src/ui/dashboard/model.rs b/src/ui/dashboard/model.rs
index 94e1bf7..a59595a 100644
--- a/src/ui/dashboard/model.rs
+++ b/src/ui/dashboard/model.rs
@@ -124,17 +124,15 @@ fn add_monitor_view_state(group: UnifiedGroupData) -> Vec<MonitorViewState> {
                 _ => MonitorStatus::Unknown,
             };
 
-            let response_time = monitor
-                .heartbeats
-                .last()
-                .and_then(|h| h.ping)
-                .map(|ms| format!("{}", ms))
-                .unwrap_or_else(|| t("unknown").to_string() + " ");
+            let response_time = match monitor.heartbeats.last().and_then(|h| h.ping) {
+                Some(ms) => format!("{}", ms),
+                None => t("unknown"),
+            };
 
-            let uptime_24h = monitor
-                .uptime_data
-                .map(|u| u.get_perc_formated())
-                .unwrap_or_else(|| t("unknown").to_string());
+            let uptime_24h = match monitor.uptime_data.map(|u| u.get_perc_formated()) {
+                Some(perc) => perc,
+                None => t("unknown"),
+            };
 
             let name: Cow<'static, str> = match monitor.name {
                 Cow::Borrowed(borrowed) => Cow::Owned(borrowed.to_string()),