diff --git a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
index 032b2ad93c..7d56f6f04d 100644
--- a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
@@ -102,12 +102,6 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
   const [stepIdReached, setStepIdReached] = React.useState(1);
   const isMutating = useIsMutating();
 
-  React.useEffect(() => {
-    if (!currentTaskgroup) {
-      createTaskgroup(defaultTaskgroup);
-    }
-  }, []);
-
   const onCreateTaskgroupSuccess = (data: Taskgroup) => {
     setCurrentTaskgroup(data);
   };
@@ -293,6 +287,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
 
       submitTaskgroup(taskgroup);
     }
+    setCurrentTaskgroup(null);
     reset();
     onClose();
   };
@@ -302,12 +297,19 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
     { prevId, prevName }
   ) => {
     if (id && stepIdReached < (id as number)) setStepIdReached(id as number);
+    if (id === 2) {
+      if (!currentTaskgroup) {
+        createTaskgroup(defaultTaskgroup);
+      }
+    }
   };
 
   const handleClose = () => {
     reset();
-    if (currentTaskgroup && currentTaskgroup.id)
+    if (currentTaskgroup && currentTaskgroup.id) {
       deleteTaskgroup(currentTaskgroup.id);
+      setCurrentTaskgroup(null);
+    }
     onClose();
   };
 
diff --git a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx
index 513f0a9627..961f961390 100644
--- a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx
+++ b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx
@@ -84,7 +84,10 @@ export const ApplicationsTableAnalyze: React.FC = () => {
   const { t } = useTranslation();
   const { pushNotification } = React.useContext(NotificationsContext);
 
-  const [isAnalyzeModalOpen, setAnalyzeModalOpen] = React.useState(false);
+  const [createUpdateModalState, setCreateUpdateModalState] = React.useState<
+    Application | Application[] | null
+  >(null);
+  const isWizardOpen = createUpdateModalState !== null;
 
   const [saveApplicationsModalState, setSaveApplicationsModalState] =
     React.useState<"create" | Application | null>(null);
@@ -553,7 +556,7 @@ export const ApplicationsTableAnalyze: React.FC = () => {
                         aria-label="Analyze Application"
                         variant={ButtonVariant.primary}
                         onClick={() => {
-                          setAnalyzeModalOpen(true);
+                          setCreateUpdateModalState(selectedRows);
                         }}
                         isDisabled={
                           selectedRows.length < 1 || !isAnalyzingAllowed()
@@ -613,9 +616,9 @@ export const ApplicationsTableAnalyze: React.FC = () => {
       </Modal>{" "}
       <AnalysisWizard
         applications={selectedRows}
-        isOpen={isAnalyzeModalOpen}
+        isOpen={isWizardOpen}
         onClose={() => {
-          setAnalyzeModalOpen(false);
+          setCreateUpdateModalState(null);
         }}
       />
       <Modal