diff --git a/apps/mtm/views.py b/apps/mtm/views.py
index e958e01b..de340349 100644
--- a/apps/mtm/views.py
+++ b/apps/mtm/views.py
@@ -44,15 +44,15 @@ class MaterialViewSet(CustomModelViewSet):
     
     def get_queryset(self):
         qs = super().get_queryset()
-        if self.action in ["list", "retrieve"]:
+        if self.action in ["list", "retrieve"] and self.request.query_params.get('wiith_count', None) == 'yes':
             return qs.annotate(
                 count_mb=Coalesce(
-                    Sum('mb_m__count', filter=Q(mb_m__state=10)), 
+                    Sum('mb_m__count', filter=Q(mb_m__state=10, mb_m__count___gt=0)), 
                     Value(0),
                     output_field=DecimalField()
                 ),
                 count_wm=Coalesce(
-                    Sum('wm_m__count', filter=Q(wm_m__state=10)), 
+                    Sum('wm_m__count', filter=Q(wm_m__state=10, wm_m__count___gt=0)), 
                     Value(0),
                     output_field=DecimalField()
                 )