diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js
index 6c37722..8fd78cc 100644
--- a/src/Components/Case/CaseDetailsPage.js
+++ b/src/Components/Case/CaseDetailsPage.js
@@ -35,8 +35,10 @@ const CaseDetailsPage = () => {
   const message =
     "Parsing document.  Please be patient, this may take several minutes.";
 
-  const handleNavigate = () => {
-    navigate("/documents");
+  const handleNavigate = (docId, caseId) => {
+    //documentId, responseGenerations, caseId, documentType
+    let responseGenerations = 1;
+    navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`);
   };
 
   const handleNavEdit = (documentId, reqType, caseId) => {
@@ -114,7 +116,7 @@ const CaseDetailsPage = () => {
     if (docType === "interrogatories-out") {
       setTimeout(handleNavEdit, 40000, docId, caseId);
     } else {
-      setTimeout(handleNavigate, 40000);
+      setTimeout(handleNavigate, 40000, docId, caseId);
     }
   };
 
@@ -149,7 +151,7 @@ const CaseDetailsPage = () => {
   if (!group) {
     return null;
   }
-  console.log("-----------------------------------------subCase", subCase);
+
   const HeadingContent = () => {
     return (
       <div className="details-heading-container">
diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index 08a440f..6216cdf 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -25,6 +25,7 @@ import "../../styles/docedit-page.scss";
 const DocEditPage = () => {
   const { documentId, responseGenerations, caseId, documentType } = useParams();
   const navigate = useNavigate();
+  const [docType, setDocType] = useState(documentType);
   const [parsedRogs, setParsedRogs] = useState();
   const [responses, setResponses] = useState([1]);
   const [fetchedCase, setFetchedCase] = useState();
@@ -127,7 +128,8 @@ const DocEditPage = () => {
   ];
 
   /*
-   *  GET docuement data from Firebase
+   *  GET document data from Firebase
+   *
    * */
 
   useEffect(() => {
@@ -213,6 +215,12 @@ const DocEditPage = () => {
     const unsub = onSnapshot(docRef, (snapshot) => {
       if (snapshot.exists() && snapshot.data().ownerId === appUserId) {
         setDocument({ ...snapshot.data(), documentId: snapshot.id });
+        if (
+          docType === undefined ||
+          (docType === null && document.length > 1)
+        ) {
+          setDocType(document.docType);
+        }
       } else {
         setDocument(null);
       }
diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index 28cf26f..3a6ca8d 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -242,7 +242,7 @@ const DocumentListPage = ({ perPage }) => {
           </div>
         </div>
         <div className="document-list-lower-wrapper">
-          {allRequestDocs.length > 0 ? (
+          {allRequestDocs?.length > 0 ? (
             allRequestDocs
               .slice((page - 1) * perPage, page * perPage)
               .map((doc, i) => (
@@ -279,7 +279,7 @@ const DocumentListPage = ({ perPage }) => {
           </div>
         </div>
         <div className="document-list-lower-wrapper">
-          {allResponseDocs.length > 0 ? (
+          {allResponseDocs?.length > 0 ? (
             allResponseDocs
               .slice((page - 1) * perPage, page * perPage)
               .map((doc, i) => (