diff --git a/src/Components/Case/CaseTypePage.js b/src/Components/Case/CaseTypePage.js
index acf612e..c4bfae9 100644
--- a/src/Components/Case/CaseTypePage.js
+++ b/src/Components/Case/CaseTypePage.js
@@ -28,14 +28,17 @@ const CaseTypePage = ({ caseData }) => {
   const navigate = useNavigate();
   const { appState } = useContext(AppContext);
   const { group } = appState;
+  const [isEditing, setFsEditing] = useState(false);
   const [subCase, setSubCase] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
   const [selectedCaseTags, setSelectedCaseTags] = useState([]);
   const typeaheadRef = useRef();
   const appUserId = group ? group.appUserId : null;
-  const [data, setData] = useState(fields);
+  const [data, setData] = useState(
+    getFormDataDefaults(fields, isEditing ? caseData : undefined)
+  );
   const [isBusy, setIsBusy] = useState(false);
-  const [isEditing, setFsEditing] = useState(false);
+
   const parsedTags = dJSON.parse(JSON.stringify(caseTags));
   const handleNavigate = () => {
     navigate("/documents");