diff --git a/web/src/Root.tsx b/web/src/Root.tsx
index 54e86f9a31..a78e3b46bc 100644
--- a/web/src/Root.tsx
+++ b/web/src/Root.tsx
@@ -579,12 +579,7 @@ const Root = () => {
                 <>
                   <Route
                     path="/:slug/cluster/manage"
-                    element={
-                      <HelmVMClusterManagement
-                        fromLicenseFlow={true}
-                        appName={state.selectedAppName || undefined}
-                      />
-                    }
+                    element={<HelmVMClusterManagement fromLicenseFlow={true} />}
                   />
                   <Route
                     path="/:slug/cluster/:nodeName"
diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx
index 3c80ae1ef9..f7ced8bec4 100644
--- a/web/src/components/apps/HelmVMClusterManagement.tsx
+++ b/web/src/components/apps/HelmVMClusterManagement.tsx
@@ -58,10 +58,8 @@ type State = {
 
 const HelmVMClusterManagement = ({
   fromLicenseFlow = false,
-  appName,
 }: {
   fromLicenseFlow?: boolean;
-  appName?: string;
 }) => {
   const [state, setState] = useReducer(
     (prevState: State, newState: Partial<State>) => ({
@@ -81,7 +79,9 @@ const HelmVMClusterManagement = ({
   const [selectedNodeTypes, setSelectedNodeTypes] = useState<string[]>([]);
 
   const { data: appsData } = useApps();
-  const app = appsData?.apps?.find((a) => a.name === appName);
+  // we grab the first app because helmvm users should only ever have one app
+  const app = appsData?.apps?.[0];
+
   const { slug } = useParams();
 
   // #region queries
diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx
index 66396d8b10..6bd7651568 100644
--- a/web/src/components/apps/HelmVMViewNode.jsx
+++ b/web/src/components/apps/HelmVMViewNode.jsx
@@ -1,5 +1,5 @@
 import { MaterialReactTable } from "material-react-table";
-import React, { useMemo } from "react";
+import React, { useMemo, setState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Link, useParams } from "react-router-dom";
 import Loader from "@components/shared/Loader";
@@ -62,15 +62,6 @@ const HelmVMViewNode = () => {
         err.status
       );
     },
-    onSuccess: (data) => {
-      setState({
-        // if cluster doesn't support ha, then primary will be disabled. Force into secondary
-        selectedNodeType: !data.ha ? "secondary" : state.selectedNodeType,
-      });
-    },
-    config: {
-      retry: false,
-    },
   });
 
   const node = nodeData || testData;