diff --git a/src/api/customRuns.js b/src/api/customRuns.js
index bf71697c13..0e08598c62 100644
--- a/src/api/customRuns.js
+++ b/src/api/customRuns.js
@@ -42,11 +42,11 @@ function getCustomRunsAPI({ filters, isWebSocket, name, namespace }) {
 }
 
 export function getCustomRunPayload({
+  customRunName = `run-${Date.now()}`,
   labels,
   namespace,
   params,
   serviceAccount,
-  customRunName = `run-${Date.now()}`,
   timeout
 }) {
   const payload = {
diff --git a/src/containers/CreateCustomRun/CreateCustomRun.jsx b/src/containers/CreateCustomRun/CreateCustomRun.jsx
index 7652c8fe91..f89d953a6f 100644
--- a/src/containers/CreateCustomRun/CreateCustomRun.jsx
+++ b/src/containers/CreateCustomRun/CreateCustomRun.jsx
@@ -58,9 +58,9 @@ function CreateCustomRun() {
 
   const [{ kind, labels, namespace, params }] = useState({
     ...initialState,
+    customRef: '',
     kind: 'Custom',
-    namespace: getNamespace(),
-    customRef: ''
+    namespace: getNamespace()
   });
 
   useTitleSync({
diff --git a/src/containers/CreateCustomRun/CreateCustomRun.test.jsx b/src/containers/CreateCustomRun/CreateCustomRun.test.jsx
index cfaeaa0171..5340f8a5e6 100644
--- a/src/containers/CreateCustomRun/CreateCustomRun.test.jsx
+++ b/src/containers/CreateCustomRun/CreateCustomRun.test.jsx
@@ -100,9 +100,6 @@ describe('CreateCustomRun yaml mode', () => {
         timeout: 3000
       }
     );
-    // await waitFor(() => {
-    //   expect(queryAllByText(/Loading/).length).toBe(0);
-    // });
     await waitFor(() => {
       expect(getByRole(/textbox/)).toBeTruthy();
     });