diff --git a/changelogs/unreleased/-1xx6u1f.yml b/changelogs/unreleased/-1xx6u1f.yml
new file mode 100644
index 000000000..1616b4a4c
--- /dev/null
+++ b/changelogs/unreleased/-1xx6u1f.yml
@@ -0,0 +1,6 @@
+---
+title: Handle empty check for color and size for orders page
+ticket_id: "#1xx6u1f"
+merge_request: 38
+author: Bashu Tiwari
+type: performance
diff --git a/src/views/orders.vue b/src/views/orders.vue
index fdf9877d7..83868d1cf 100644
--- a/src/views/orders.vue
+++ b/src/views/orders.vue
@@ -121,8 +121,8 @@
                 </ion-thumbnail>
                 <ion-label>
                   <h2>{{ item.parentProductName ? item.parentProductName :item.productName }}</h2>
-                  <p>{{ $t("Color") }} : {{ $filters.getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/') }}</p>
-                  <p>{{ $t("Size") }} : {{ $filters.getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/') }}</p>
+                  <p v-if="$filters.getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')">{{ $t("Color") }} : {{ $filters.getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/') }}</p>
+                  <p v-if="$filters.getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')">{{ $t("Size") }} : {{ $filters.getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/') }}</p>
                 </ion-label>
               </ion-item>
               <ion-item lines="none">
diff --git a/src/views/product-details.vue b/src/views/product-details.vue
index ad91cd148..933f6796d 100644
--- a/src/views/product-details.vue
+++ b/src/views/product-details.vue
@@ -29,7 +29,7 @@
             <h1>{{ current.product.productName }}</h1>
           </ion-item>
           <div class="product-features">
-            <ion-list>
+            <ion-list v-if="$filters.getFeaturesList(current.product.featureHierarchy, '1/COLOR/').length">
               <ion-list-header>{{ $t("Colors") }}</ion-list-header>
               <ion-item lines="none">
                   <ion-row>
@@ -37,7 +37,7 @@
                   </ion-row>
               </ion-item>
             </ion-list>
-            <ion-list>
+            <ion-list v-if="$filters.getFeaturesList(current.product.featureHierarchy, '1/SIZE/').length">
               <ion-list-header>{{ $t("Sizes") }} </ion-list-header>
               <ion-item lines="none">
                   <ion-row>
@@ -124,8 +124,8 @@
               </ion-thumbnail>
               <ion-label>
                 <h2> {{ getProduct(item.groupValue).productName }}</h2>
-                <p>{{ $t("Color") }}: {{ $filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/COLOR/') }}</p>
-                <p>{{ $t("Size") }}: {{ $filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/SIZE/') }}</p>
+                <p v-if="$filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/COLOR/')">{{ $t("Color") }}: {{ $filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/COLOR/') }}</p>
+                <p v-if="$filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/SIZE/')">{{ $t("Size") }}: {{ $filters.getFeature(getProduct(item.groupValue).featureHierarchy, '1/SIZE/') }}</p>
               </ion-label>
             </ion-item>
           </div>
diff --git a/src/views/products.vue b/src/views/products.vue
index f176a3ba4..1762712ea 100644
--- a/src/views/products.vue
+++ b/src/views/products.vue
@@ -33,8 +33,8 @@
           </ion-thumbnail>
           <ion-label>
             <h2>{{ getProduct(product.groupValue).productName}}</h2>
-            <p>{{ $t("Colors") }} : {{ $filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/COLOR/') }} </p>
-            <p>{{ $t("Sizes") }} : {{ $filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/SIZE/') }} </p>
+            <p v-if="$filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/COLOR/')">{{ $t("Colors") }} : {{ $filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/COLOR/') }} </p>
+            <p v-if="$filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/SIZE/')">{{ $t("Sizes") }} : {{ $filters.getFeatures(getProduct(product.groupValue).featureHierarchy, '1/SIZE/') }} </p>
           </ion-label>
           <ion-badge slot="end" color="success">{{ product.doclist.numFound }} {{ $t("pieces preordered") }}</ion-badge>
         </ion-item>