diff --git a/.idea/Rasaddam_Backend.iml b/.idea/Rasaddam_Backend.iml
index 57ec562..168bde0 100644
--- a/.idea/Rasaddam_Backend.iml
+++ b/.idea/Rasaddam_Backend.iml
@@ -14,7 +14,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.10 (env)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bbe7f0a..f1b70db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.10 (env)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (env)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py
index 49337ec..c185fe1 100644
--- a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py
+++ b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py
@@ -114,13 +114,17 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
         representation['warehouse_balance'] = quotas_stat_amount['inventory_entry_balance']
         representation['been_sold'] = quotas_stat_amount['been_sold']
 
+        # if quota stat exists and do not have attribute values, check !
+        attribute_values = quota.attribute_values.filter(org_quota_stat=quota_stat)
         representation['attribute_values'] = product_serializers.AttributeValueSerializer(
-            quota.attribute_values.filter(org_quota_stat=quota_stat),
+            attribute_values if attribute_values.exists() else quota.attribute_values.filter(org_quota_stat=None),
             many=True
         ).data
 
+        # if quota stat exists and do not have broker values, check !
+        broker_values = quota.broker_values.filter(org_quota_stat=quota_stat)
         representation['brokers'] = QuotaBrokerValueSerializer(
-            quota.broker_values.filter(org_quota_stat=quota_stat),
+            broker_values if broker_values.exists() else quota.broker_values.filter(org_quota_stat=None),
             many=True
         ).data