diff --git a/lib/towerops_web/live/map_live/index.ex b/lib/towerops_web/live/map_live/index.ex
index aa9844ae..3bd34bcc 100644
--- a/lib/towerops_web/live/map_live/index.ex
+++ b/lib/towerops_web/live/map_live/index.ex
@@ -56,7 +56,7 @@ defmodule ToweropsWeb.MapLive.Index do
           address: site.address,
           latitude: site.latitude,
           longitude: site.longitude,
-          device_count: length(site.device || [])
+          device_count: if(is_list(site.device), do: length(site.device), else: 0)
         }
       end)