diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/TestCases.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/TestCases.spec.ts
index 0d5c7759fda..91c6506b965 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/TestCases.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/TestCases.spec.ts
@@ -119,7 +119,7 @@ test('Table difference test case', async ({ page }) => {
     await test.step('Delete', async () => {
       await deleteTestCase(page, testCase.name);
     });
-  } catch (error) {
+  } finally {
     await table1.delete(apiContext);
     await table2.delete(apiContext);
 
@@ -212,7 +212,7 @@ test('Custom SQL Query', async ({ page }) => {
     await test.step('Delete', async () => {
       await deleteTestCase(page, testCase.name);
     });
-  } catch (error) {
+  } finally {
     await table.delete(apiContext);
     await afterAction();
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx
index 6548d6150a6..e772b82ceb6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx
@@ -44,6 +44,7 @@ import {
 } from '../../../utils/EntityUtils';
 import { getEntityFQN } from '../../../utils/FeedUtils';
 import { generateFormFields } from '../../../utils/formUtils';
+import { isValidJSONString } from '../../../utils/StringsUtils';
 import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
 import Loader from '../../common/Loader/Loader';
 import RichTextEditor from '../../common/RichTextEditor/RichTextEditor';
@@ -144,7 +145,10 @@ const EditTestCaseModal: React.FC<EditTestCaseModalProps> = ({
         (definition) => definition.name === curr.name
       );
 
-      if (param?.dataType === TestDataType.Array) {
+      if (
+        param?.dataType === TestDataType.Array &&
+        isValidJSONString(curr.value)
+      ) {
         const value = JSON.parse(curr.value || '[]');
 
         return {