diff --git a/src/DocumentationBrowserViewExtension/NodeDocumentationHtmlGenerator.cs b/src/DocumentationBrowserViewExtension/NodeDocumentationHtmlGenerator.cs
index 505fadc90d1..28185608796 100644
--- a/src/DocumentationBrowserViewExtension/NodeDocumentationHtmlGenerator.cs
+++ b/src/DocumentationBrowserViewExtension/NodeDocumentationHtmlGenerator.cs
@@ -268,7 +268,7 @@ private static string CreateInputsAndOutputs(OpenNodeAnnotationEventArgs e)
             {
                 sb.AppendLine("<tr class=\"table--border\">");
                 sb.AppendLine($"<td class=\"table--border\">{e.InputNames.ElementAt(i)}</td>");
-                sb.AppendLine($"<td class=\"table--border\">{GetTypeFromDescription(e.InputDescriptions.ElementAt(i))}</td>");
+                sb.AppendLine($"<td class=\"table--border\">{e.InputTypes.ElementAt(i)}</td>");
                 sb.AppendLine($"<td class=\"table--border\">{GetNthRowFromStringSplit(e.InputDescriptions.ElementAt(i), 0)}</td>");
                 sb.AppendLine($"<td class=\"table--border broken\">{GetDefaultValueFromDescription(e.InputDescriptions.ElementAt(i))}</td>");
                 sb.AppendLine(@"</tr>");
@@ -292,6 +292,7 @@ private static string CreateInputsAndOutputs(OpenNodeAnnotationEventArgs e)
                 sb.AppendLine(" <tr class=\"table--border\">");
                 sb.AppendLine($"<td class=\"table--border\">{e.OutputNames.ElementAt(i)}</td>");
                 sb.AppendLine($"<td class=\"table--border\">{GetNthRowFromStringSplit(e.OutputDescriptions.ElementAt(i), 0)}</td>");
+                sb.AppendLine($"<td class=\"table--border\">{e.OutputTypes.ElementAt(i)}</td>");
                 sb.AppendLine(@"</tr>");
             }
 
@@ -302,13 +303,6 @@ private static string CreateInputsAndOutputs(OpenNodeAnnotationEventArgs e)
             return sb.ToString();
         }
 
-         private static string GetTypeFromDescription(string element)
-         {
-             var stringArr = element.Split(new string[] {"\r\n", "\r", "\n"}, StringSplitOptions.None);
-             if(stringArr.Length > 2) return stringArr[2];
-             return string.Empty;
-         }
-
          private static string GetDefaultValueFromDescription(string element)
          {
              var stringArr = element.Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
diff --git a/src/DynamoCore/Graph/Nodes/PortModel.cs b/src/DynamoCore/Graph/Nodes/PortModel.cs
index 821e6f6f4a3..481a060cd93 100644
--- a/src/DynamoCore/Graph/Nodes/PortModel.cs
+++ b/src/DynamoCore/Graph/Nodes/PortModel.cs
@@ -515,12 +515,23 @@ internal string GetInputPortType()
 
                 try
                 {
-                    return inPortAttribute?.PortTypes.ElementAt(Index);
+                    var attrType = inPortAttribute?.PortTypes.ElementAt(Index);
+                    if (attrType != null) return attrType;
                 }
                 catch (Exception e)
                 {
                     Log(e.Message);
                 }
+
+                // Fallback: infer from the port's default value node type.
+                return DefaultValue switch
+                {
+                    IntNode     _ => "int",
+                    DoubleNode  _ => "double",
+                    BooleanNode _ => "bool",
+                    StringNode  _ => "string",
+                    _ => null
+                };
             }
             return null;
         }
diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt
index 946f2f99586..bc9d8900f77 100644
--- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt
+++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt
@@ -26,6 +26,8 @@ Dynamo.ViewModels.DynamoViewModel.PythonEngineUpgradeToastRequested -> System.Ac
 Dynamo.ViewModels.DynamoViewModel.ToastManager.get -> Dynamo.Wpf.UI.ToastManager
 Dynamo.ViewModels.DynamoViewModel.ToastManager.set -> void
 Dynamo.ViewModels.DynamoViewModel.ShowPythonEngineUpgradeCanvasToast(string message, bool stayOpen = true, string filePath = null) -> void
+Dynamo.ViewModels.OpenNodeAnnotationEventArgs.InputTypes.get -> System.Collections.Generic.IEnumerable<string>
+Dynamo.ViewModels.OpenNodeAnnotationEventArgs.OutputTypes.get -> System.Collections.Generic.IEnumerable<string>
 Dynamo.ViewModels.PreferencesViewModel.AutoSyncDocumentBrowserIsChecked.get -> bool
 Dynamo.ViewModels.PreferencesViewModel.AutoSyncDocumentBrowserIsChecked.set -> void
 Dynamo.ViewModels.PreferencesViewModel.ShowPythonAutoMigrationNotificationIsChecked.get -> bool
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs
index 5b766bba0a6..2a57be22486 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs
@@ -217,6 +217,14 @@ public class OpenNodeAnnotationEventArgs : OpenDocumentationLinkEventArgs
         /// </summary>
         public IEnumerable<string> OutputDescriptions { get; private set; }
         /// <summary>
+        /// Collection of the nodes input port types.
+        /// </summary>
+        public IEnumerable<string> InputTypes { get; private set; }
+        /// <summary>
+        /// Collection of the nodes output port types.
+        /// </summary>
+        public IEnumerable<string> OutputTypes { get; private set; }
+        /// <summary>
         /// Collection of the nodes collection of warnings/errors/infos.
         /// </summary>
         public IEnumerable<Info> NodeInfos { get; private set; }
@@ -247,33 +255,38 @@ private void SetOutputs(NodeModel nodeModel)
         {
             var outputNames = new List<string>();
             var outputDescriptions = new List<string>();
+            var outputTypes = new List<string>();
 
             var outputs = nodeModel.OutPorts;
             foreach (var output in outputs)
             {
                 outputNames.Add(output.Name);
                 outputDescriptions.Add(output.ToolTip);
+                outputTypes.Add(output.GetOutPortType() ?? string.Empty);
             }
 
             OutputNames = outputNames;
             OutputDescriptions = outputDescriptions;
+            OutputTypes = outputTypes;
         }
 
         private void SetInputs(NodeModel nodeModel)
         {
             var inputNames = new List<string>();
             var inputDescriptions = new List<string>();
+            var inputTypes = new List<string>();
 
             var inputs = nodeModel.InPorts;
             foreach (var input in inputs)
             {
                 inputNames.Add(input.Name);
                 inputDescriptions.Add(input.ToolTip);
+                inputTypes.Add(input.GetInputPortType() ?? string.Empty);
             }
 
             InputNames = inputNames;
             InputDescriptions = inputDescriptions;
-
+            InputTypes = inputTypes;
         }
     }
 
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/AssemblyHandler.cs b/src/Tools/NodeDocumentationMarkdownGenerator/AssemblyHandler.cs
index 60c14eb112f..4f0b6b09c12 100644
--- a/src/Tools/NodeDocumentationMarkdownGenerator/AssemblyHandler.cs
+++ b/src/Tools/NodeDocumentationMarkdownGenerator/AssemblyHandler.cs
@@ -422,7 +422,7 @@ private static List<TypedParameter> BuildParameters(ArgumentSignatureNode signat
                     }
                 }
 
-                typeParams.Add(new TypedParameter(name));
+                typeParams.Add(new TypedParameter(name, arg.ArgumentType));
             }
 
             return typeParams;
diff --git a/test/DynamoCoreWpf3Tests/NodeViewTests.cs b/test/DynamoCoreWpf3Tests/NodeViewTests.cs
index f581679cd2e..1efa27b3e73 100644
--- a/test/DynamoCoreWpf3Tests/NodeViewTests.cs
+++ b/test/DynamoCoreWpf3Tests/NodeViewTests.cs
@@ -9,6 +9,7 @@
 using System.Windows.Media;
 using Dynamo.Controls;
 using Dynamo.Graph;
+using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.Selection;
@@ -16,12 +17,24 @@
 using Dynamo.ViewModels;
 using DynamoCoreWpfTests.Utility;
 using NUnit.Framework;
+using ProtoCore.AST.AssociativeAST;
 
 namespace DynamoCoreWpfTests
 {
     public class NodeViewTests : DynamoTestUIBase
     {
         // adapted from: http://stackoverflow.com/questions/9336165/correct-method-for-using-the-wpf-dispatcher-in-unit-tests
+        private class DefaultValueInputTypeNode : NodeModel
+        {
+            internal DefaultValueInputTypeNode()
+            {
+                InPorts.Add(new PortModel(PortType.Input, this, new PortData("integer", "integer", AstFactory.BuildIntNode(1))));
+                InPorts.Add(new PortModel(PortType.Input, this, new PortData("number", "number", AstFactory.BuildDoubleNode(1.0))));
+                InPorts.Add(new PortModel(PortType.Input, this, new PortData("boolean", "boolean", AstFactory.BuildBooleanNode(true))));
+                InPorts.Add(new PortModel(PortType.Input, this, new PortData("text", "text", AstFactory.BuildStringNode("value"))));
+                RegisterAllPorts();
+            }
+        }
 
         protected override void GetLibrariesToPreload(List<string> libraries)
         {
@@ -361,6 +374,16 @@ public void InputPortType_NodeModelNode_AreCorrect()
             Assert.AreEqual("System.Drawing.Bitmap", type);
         }
 
+        [Test]
+        public void InputPortType_NodeModelNodeWithoutInPortTypes_FallsBackToDefaultValueType()
+        {
+            var node = new DefaultValueInputTypeNode();
+
+            CollectionAssert.AreEqual(
+                new[] { "int", "double", "bool", "string" },
+                node.InPorts.Select(port => port.GetInputPortType()));
+        }
+
         [Test]
         [Category("RegressionTests")]
         public void GettingNodeNameDoesNotTriggerPropertyChangeCycle()