diff --git a/components/tracks/Track.tsx b/components/tracks/Track.tsx
index 30e5958..f12a060 100644
--- a/components/tracks/Track.tsx
+++ b/components/tracks/Track.tsx
@@ -641,7 +641,7 @@ export function Track({
     }
   };
 
-  const trackHeight = track.collapsed ? COLLAPSED_TRACK_HEIGHT : track.height;
+  const trackHeight = track.collapsed ? COLLAPSED_TRACK_HEIGHT : Math.max(track.height || MIN_TRACK_HEIGHT, MIN_TRACK_HEIGHT);
 
   // Track height resize handlers
   const handleResizeStart = React.useCallback(
diff --git a/components/tracks/TrackList.tsx b/components/tracks/TrackList.tsx
index f3e6ceb..629a0ed 100644
--- a/components/tracks/TrackList.tsx
+++ b/components/tracks/TrackList.tsx
@@ -7,7 +7,7 @@ import { Track } from './Track';
 import { TrackExtensions } from './TrackExtensions';
 import { ImportTrackDialog } from './ImportTrackDialog';
 import type { Track as TrackType } from '@/types/track';
-import { DEFAULT_TRACK_HEIGHT, COLLAPSED_TRACK_HEIGHT } from '@/types/track';
+import { DEFAULT_TRACK_HEIGHT, COLLAPSED_TRACK_HEIGHT, MIN_TRACK_HEIGHT } from '@/types/track';
 import { createEffect, type EffectType, EFFECT_NAMES } from '@/lib/audio/effects/chain';
 import { AutomationLane } from '@/components/automation/AutomationLane';
 import type { AutomationPoint as AutomationPointType } from '@/types/automation';
@@ -211,7 +211,7 @@ export function TrackList({
                 <div
                   className="flex flex-col"
                   style={{
-                    height: track.collapsed ? `${COLLAPSED_TRACK_HEIGHT}px` : `${track.height || DEFAULT_TRACK_HEIGHT}px`
+                    height: track.collapsed ? `${COLLAPSED_TRACK_HEIGHT}px` : `${Math.max(track.height || DEFAULT_TRACK_HEIGHT, MIN_TRACK_HEIGHT)}px`
                   }}
                 >
                   {/* Waveform - Takes remaining space */}