diff --git a/server/routes/api_routes.py b/server/routes/api_routes.py
index 5471c25..2a3c099 100644
--- a/server/routes/api_routes.py
+++ b/server/routes/api_routes.py
@@ -226,16 +226,16 @@ def export_csv(
             c.current_ip or "",
             c.status,
             c.os_info or "",
-            c.current_cpu_percent or "",
-            c.current_ram_percent or "",
-            c.current_ram_used_gb or "",
-            c.current_ram_total_gb or "",
-            c.current_ram_available_gb or "",
-            c.current_swap_percent or "",
-            c.current_swap_used_gb or "",
-            c.current_swap_total_gb or "",
-            c.current_swap_free_gb or "",
-            c.current_uptime_sec or "",
+            "" if c.current_cpu_percent is None else c.current_cpu_percent,
+            "" if c.current_ram_percent is None else c.current_ram_percent,
+            "" if c.current_ram_used_gb is None else c.current_ram_used_gb,
+            "" if c.current_ram_total_gb is None else c.current_ram_total_gb,
+            "" if c.current_ram_available_gb is None else c.current_ram_available_gb,
+            "" if c.current_swap_percent is None else c.current_swap_percent,
+            "" if c.current_swap_used_gb is None else c.current_swap_used_gb,
+            "" if c.current_swap_total_gb is None else c.current_swap_total_gb,
+            "" if c.current_swap_free_gb is None else c.current_swap_free_gb,
+            "" if c.current_uptime_sec is None else c.current_uptime_sec,
             c.last_seen.isoformat() if c.last_seen else "",
             c.first_seen.isoformat() if c.first_seen else "",
         ])