From 84da62ea786ef01f62b1629958fa6ff2ba3cf848 Mon Sep 17 00:00:00 2001
From: gauravagarwal1001 <37572719+gauravagarwal1001@users.noreply.github.com>
Date: Wed, 8 May 2019 20:03:37 +0530
Subject: [PATCH] Fixed issue #22788

---
 .../Sales/view/frontend/templates/email/shipment/track.phtml  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index f1cd5f2b99865..6de8e42dea583 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -9,8 +9,9 @@
 ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php $_order = $block->getOrder() ?>
+<?php if ($_shipment && $_order): ?>
 <?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
-<?php if ($_shipment && $_order && $trackCollection): ?>
+<?php if ($trackCollection): ?>
     <br />
     <table class="shipment-track">
         <thead>
@@ -29,3 +30,4 @@
         </tbody>
     </table>
 <?php endif; ?>
+<?php endif; ?>