diff --git a/src/cmd/ksh93/edit/edit.c b/src/cmd/ksh93/edit/edit.c
index 04d710b19..58af3577e 100644
--- a/src/cmd/ksh93/edit/edit.c
+++ b/src/cmd/ksh93/edit/edit.c
@@ -1762,8 +1762,13 @@ int ed_histgen(Edit_t *ep,const char *pattern)
 			mplast->next = mp;
 		mplast->next = 0;
 	}
-	ep->hlist = (Histmatch_t**)argv;
-	ep->hfirst = ep->hlist?ep->hlist[0]:0;
+	if (argv)
+	{
+		ep->hlist = (Histmatch_t**)argv;
+		ep->hfirst = ep->hlist?ep->hlist[0]:0;
+	}
+	else
+		ep->hfirst = 0;
 	return(ep->hmax=ac);
 }