diff --git a/src/plugins/timeline/TimelineViewLayout.vue b/src/plugins/timeline/TimelineViewLayout.vue
index 821cbdc155..ddb10f94a8 100644
--- a/src/plugins/timeline/TimelineViewLayout.vue
+++ b/src/plugins/timeline/TimelineViewLayout.vue
@@ -75,6 +75,7 @@ const unknownObjectType = {
 };
 
 const AXES_PADDING = 20;
+const PLOT_ITEM_H_PX = 100;
 
 export default {
   components: {
@@ -156,14 +157,12 @@ export default {
         rowCount = getValidatedGroups(domainObject, planData).length;
       } else if (domainObject.type === 'gantt-chart') {
         rowCount = Object.keys(domainObject.configuration.swimlaneVisibility).length;
-      } else if (domainObject.type === 'telemetry.plot.stacked') {
-        rowCount = domainObject.composition.length;
       }
 
       let height =
         domainObject.type === 'telemetry.plot.stacked'
-          ? `${domainObject.composition.length * 100}px`
-          : '100px';
+          ? `${domainObject.composition.length * PLOT_ITEM_H_PX}px`
+          : 'auto';
       let item = {
         domainObject,
         objectPath,
diff --git a/src/ui/components/swim-lane/SwimLane.vue b/src/ui/components/swim-lane/SwimLane.vue
index 797a5659d4..9b1af21107 100644
--- a/src/ui/components/swim-lane/SwimLane.vue
+++ b/src/ui/components/swim-lane/SwimLane.vue
@@ -56,7 +56,11 @@
         />
       </div>
     </div>
-    <div class="c-swimlane__lane-object" :class="{ 'u-contents': showUcontents }">
+    <div
+      class="c-swimlane__lane-object"
+      :style="{ 'min-height': minHeight }"
+      :class="{ 'u-contents': showUcontents }"
+    >
       <slot name="object"></slot>
     </div>
   </div>