diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
index 0506c7f..54f2fc0 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
@@ -279,12 +279,10 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
             .otherwise(0L)
             .sum();
 
-    if (StringUtils.isNotBlank(req.getModelNo())) {
-      if (req.getModelNo().equals(ModelType.G2.getId())) {
-        selectedCnt = wasteCnt;
-      } else if (req.getModelNo().equals(ModelType.G3.getId())) {
-        selectedCnt = elseCnt;
-      }
+    if (req.getModelNo().equals(ModelType.G2.getId())) {
+      selectedCnt = wasteCnt;
+    } else {
+      selectedCnt = elseCnt;
     }
 
     if (StringUtils.isNotBlank(req.getDataType())) {