diff --git a/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs b/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
index 52464bd0..cefc9614 100644
--- a/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
+++ b/src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
@@ -97,7 +97,6 @@ private static bool IsValidParameterList(IReadOnlyList<KeyValuePair<string, obje
             string parameterName;
 
             var parameterCount = parameterList.Count;
-
             for (int i = 0; i < parameterCount; ++i)
             {
                 if (!TryGetParameterName(parameterList, i, out parameterName))
@@ -188,15 +187,21 @@ public MessageTemplateParameter this[int index]
                     index += 1;
 
                 var parameter = _parameterList[index];
-                var parameterName = parameter.Key;
-                var capture = GetCaptureType(parameterName[0]);
-                if (capture != CaptureType.Normal)
-                    parameterName = parameterName.Substring(1);
-                return new MessageTemplateParameter(parameterName, parameter.Value, null, capture);
+                return _hasMessageTemplateCapture ?
+                    GetMessageTemplateParameter(parameter.Key, parameter.Value) :
+                    new MessageTemplateParameter(parameter.Key, parameter.Value, null, CaptureType.Normal);
             }
             set => throw new NotSupportedException();
         }
 
+        private static MessageTemplateParameter GetMessageTemplateParameter(string parameterName, object parameterValue)
+        {
+            var capture = GetCaptureType(parameterName[0]);
+            if (capture != CaptureType.Normal)
+                parameterName = parameterName.Substring(1);
+            return new MessageTemplateParameter(parameterName, parameterValue, null, capture);
+        }
+
         private static CaptureType GetCaptureType(char firstChar)
         {
             if (firstChar == '@')