diff --git a/apps/hyperdrive-trading/src/ui/portfolio/longs/LongsContainer.tsx b/apps/hyperdrive-trading/src/ui/portfolio/longs/LongsContainer.tsx
index 388c4c6f1..94256d8bb 100644
--- a/apps/hyperdrive-trading/src/ui/portfolio/longs/LongsContainer.tsx
+++ b/apps/hyperdrive-trading/src/ui/portfolio/longs/LongsContainer.tsx
@@ -41,7 +41,10 @@ export function OpenLongsContainer({
     );
   }
 
-  if (openLongPositions?.every((position) => !position.openLongs.length)) {
+  if (
+    !openLongPositions ||
+    openLongPositions.every((position) => !position.openLongs.length)
+  ) {
     return (
       <PositionContainer className="my-28">
         <NonIdealState
diff --git a/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx b/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
index 237fc881a..a393b35b4 100644
--- a/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
+++ b/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
@@ -40,7 +40,8 @@ export function OpenShortsContainer({
   }
 
   if (
-    openShortPositions?.every((position) => position.openShorts.length === 0)
+    !openShortPositions ||
+    openShortPositions.every((position) => position.openShorts.length === 0)
   ) {
     return (
       <PositionContainer className="my-28">
diff --git a/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsData.ts b/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsData.ts
index 99489a787..c7c97504e 100644
--- a/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsData.ts
+++ b/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsData.ts
@@ -84,6 +84,7 @@ export function usePortfolioShortsDataFromHyperdrives({
                   address: hyperdrive.address,
                   drift: getDrift({ chainId: hyperdrive.chainId }),
                   earliestBlock: hyperdrive.initializationBlock,
+                  debugName: hyperdrive.name,
                   zapContractAddress:
                     appConfigForConnectedChain.zaps[hyperdrive.chainId]
                       ?.address,
diff --git a/packages/hyperdrive-js/src/hyperdrive/ReadHyperdrive.ts b/packages/hyperdrive-js/src/hyperdrive/ReadHyperdrive.ts
index 847a299c0..c44217867 100644
--- a/packages/hyperdrive-js/src/hyperdrive/ReadHyperdrive.ts
+++ b/packages/hyperdrive-js/src/hyperdrive/ReadHyperdrive.ts
@@ -987,7 +987,6 @@ export class ReadHyperdrive extends ReadClient {
       });
 
       // Create a default empty short that we will update based on the events
-      // const short: OpenShort = openShorts[assetId] || {
       openShorts[assetId] = openShorts[assetId] || {
         hyperdriveAddress,
         assetId: event.args.assetId,