diff --git a/PSReadLine/DynamicHelp.cs b/PSReadLine/DynamicHelp.cs
index b59bd15..bffa4ac 100644
--- a/PSReadLine/DynamicHelp.cs
+++ b/PSReadLine/DynamicHelp.cs
@@ -151,6 +151,9 @@ namespace Microsoft.PowerShell
             string commandName = null;
             string parameterName = null;
 
+            // Simply return if nothing is rendered yet.
+            if (_singleton._tokens == null) { return; }
+
             foreach(var token in _singleton._tokens)
             {
                 var extent = token.Extent;
diff --git a/test/DynamicHelpTest.cs b/test/DynamicHelpTest.cs
index 5470f93..68c1d18 100644
--- a/test/DynamicHelpTest.cs
+++ b/test/DynamicHelpTest.cs
@@ -97,6 +97,13 @@ PARAMETERS
             return paramHelp;
         }
 
+        [SkippableFact]
+        public void DynHelp_GetFullHelp_OnEmptyLine()
+        {
+            TestSetup(KeyMode.Cmd);
+            Test("", Keys(_.F1, _.Enter));
+        }
+
         [SkippableFact]
         public void DynHelp_GetFullHelp()
         {
@@ -108,6 +115,13 @@ PARAMETERS
                 ));
         }
 
+        [SkippableFact]
+        public void DynHelp_GetParameterHelp_OnEmptyLine()
+        {
+            TestSetup(KeyMode.Cmd);
+            Test("", Keys(_.Alt_h, _.Enter));
+        }
+
         [SkippableFact]
         public void DynHelp_GetParameterHelp_And_Clear()
         {