diff --git a/DecSm.Atom.Tests/BuildTests/Console/ConsoleTests.ConsoleBuildDefinition_Displays_DefaultConsoleMessage.verified.txt b/DecSm.Atom.Tests/BuildTests/Console/ConsoleTests.ConsoleBuildDefinition_Displays_DefaultConsoleMessage.verified.txt
index 7df8b41b..dc36125c 100644
--- a/DecSm.Atom.Tests/BuildTests/Console/ConsoleTests.ConsoleBuildDefinition_Displays_DefaultConsoleMessage.verified.txt
+++ b/DecSm.Atom.Tests/BuildTests/Console/ConsoleTests.ConsoleBuildDefinition_Displays_DefaultConsoleMessage.verified.txt
@@ -22,7 +22,7 @@ ConsoleTarget | Console target
 ├── Requires
 │   └── --required-param | Required param
 ├── Options
-│   └── --default-param | Default param
+│   └── --default-param [Default: default-value] | Default param
 └── Secrets
     └── --secret-param | Secret param
 
diff --git a/DecSm.Atom/Help/HelpService.cs b/DecSm.Atom/Help/HelpService.cs
index 6cc80e94..f5a83139 100644
--- a/DecSm.Atom/Help/HelpService.cs
+++ b/DecSm.Atom/Help/HelpService.cs
@@ -154,10 +154,11 @@ private void WriteCommand(TargetModel target)
 
             foreach (var optionalParam in optionalParams)
             {
-                var defaultValue = optionalParam.Param.DefaultValue;
+                var defaultValue = optionalParam.Param.DefaultValue ?? string.Empty;
 
                 var configuredValue = config
-                    .GetSection("Params")[optionalParam.Param.ArgName];
+                                          .GetSection("Params")[optionalParam.Param.ArgName] ??
+                                      string.Empty;
 
                 var defaultDisplay = (defaultValue, configuredValue) switch
                 {