diff --git a/webservice/webservice.py b/webservice/webservice.py
index 2ce0f9d3eabb3de3de24fffcf479c9c67f2bcc89..5e49f8f53cf54958d0edbd558944efac47217f78 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -770,9 +770,11 @@ async def update_mdc_status(mdc: MetadataClient, action: str,
     Further informations are available at:
     https://git.xfel.eu/gitlab/detectors/pycalibration/wikis/MyMDC-Communication
     """
-    if message.split(':')[0] in ('FAILED', 'WARN'):  # Errors
+    if message.startswith('FAILED:'):
         flag = 'E'
-    elif message.split(':')[0] == 'SUCCESS':  # Success
+    elif message.startswith('WARN:'):
+        flag = 'AW' if action == 'correct' else 'E'
+    elif message.startswith('SUCCESS:'):
         flag = 'IP'
         if 'Uploaded' in message or 'Finished' in message:
             flag = 'A' if action == 'correct' else 'F'