diff --git a/src/Common/Commands.Common/MetricHelper.cs b/src/Common/Commands.Common/MetricHelper.cs
index a3e6aeb0f744..de1ee6251f2a 100644
--- a/src/Common/Commands.Common/MetricHelper.cs
+++ b/src/Common/Commands.Common/MetricHelper.cs
@@ -150,7 +150,8 @@ private void LogExceptionEvent(AzurePSQoSEvent qos)
                 LoadTelemetryClientContext(qos, client.Context);
                 PopulatePropertiesFromQos(qos, eventProperties);
                 // qos.Exception contains exception message which may contain Users specific data. 
-                // We should not collect users specific data. 
+                // We should not collect users specific data.
+                eventProperties.Add("Message", "Message removed due to PII.");
                 eventProperties.Add("StackTrace", qos.Exception.StackTrace);
                 eventProperties.Add("ExceptionType", qos.Exception.GetType().ToString());
                 client.TrackException(null, eventProperties, eventMetrics);