diff --git a/muranoapi/api/v1/deployments.py b/muranoapi/api/v1/deployments.py
index 7d88234d4..1c03728a3 100644
--- a/muranoapi/api/v1/deployments.py
+++ b/muranoapi/api/v1/deployments.py
@@ -90,8 +90,12 @@ def create_resource():
 
 
 def set_dep_state(deployment, unit):
-    num_errors = unit.query(Status).filter_by(level='error').count()
-    num_warnings = unit.query(Status).filter_by(level='warning').count()
+    num_errors = unit.query(Status).filter_by(level='error',
+                                              deployment_id=deployment.id). \
+        count()
+    num_warnings = unit.query(Status).filter_by(level='warning',
+                                                deployment_id=deployment.id). \
+        count()
     if deployment.finished:
         if num_errors:
             deployment.state = 'completed_w_errors'
diff --git a/muranoapi/common/service.py b/muranoapi/common/service.py
index 7796a5e8b..546c6bccb 100644
--- a/muranoapi/common/service.py
+++ b/muranoapi/common/service.py
@@ -113,8 +113,12 @@ def handle_result(message):
         deployment = get_last_deployment(session, environment.id)
         deployment.finished = timeutils.utcnow()
 
-        num_errors = session.query(Status).filter_by(level='error').count()
-        num_warnings = session.query(Status).filter_by(level='warning').count()
+        num_errors = session.query(Status).filter_by(level='error',
+                                                     deployment_id=deployment.
+                                                     id).count()
+        num_warnings = session.query(Status).filter_by(level='warning',
+                                                       deployment_id=
+                                                       deployment.id).count()
 
         final_status_text = "Deployment finished"
         if num_errors: