diff --git a/lib/cobblemon_ui_web/live/dashboard_live.ex b/lib/cobblemon_ui_web/live/dashboard_live.ex
index 9271fb8..c652092 100644
--- a/lib/cobblemon_ui_web/live/dashboard_live.ex
+++ b/lib/cobblemon_ui_web/live/dashboard_live.ex
@@ -254,7 +254,7 @@ defmodule CobblemonUiWeb.DashboardLive do
               <%!-- Party view --%>
               <div :if={@view_mode == :party}>
                 <div class="grid grid-cols-2 sm:grid-cols-3 gap-3">
-                  <%= for {pokemon, idx} <- Enum.with_index(@player_data.party) do %>
+                  <%= for {pokemon, idx} <- Enum.with_index(@player_data.party), not is_nil(pokemon) do %>
                     <.pokemon_card
                       pokemon={pokemon}
                       index={idx}
@@ -271,7 +271,7 @@ defmodule CobblemonUiWeb.DashboardLive do
                     Box {box.box + 1}
                   </h3>
                   <div class="grid grid-cols-3 sm:grid-cols-5 lg:grid-cols-6 gap-2">
-                    <%= for {pokemon, idx} <- Enum.with_index(box.pokemon) do %>
+                    <%= for {pokemon, idx} <- Enum.with_index(box.pokemon), not is_nil(pokemon) do %>
                       <.pokemon_card
                         pokemon={pokemon}
                         index={pc_global_index(@player_data.pc, box.box, idx)}