diff --git a/web/package.json b/web/package.json
index f5c03bc3a..e0e06ce3f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -122,7 +122,6 @@
     "jquery-contextmenu": "^2.9.2",
     "json-bignumber": "^1.0.1",
     "jsoneditor": "^9.5.4",
-    "jsoneditor-react": "^3.1.1",
     "karma-coverage": "^2.0.3",
     "leaflet": "^1.5.1",
     "lodash": "4.*",
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index 93e69be92..79b17a315 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -536,13 +536,13 @@ export class Tree {
       */
       if (e.dataTransfer.setDragImage) {
         const dragItem = document.createElement('div');
-        dragItem.setAttribute('drag-tree-node');
+        dragItem.classList.add('drag-tree-node');
         dragItem.innerHTML = `<span>${_.escape(dropDetails.text)}</span>`;
 
-        document.querySelector('body .drag-tree-node').remove();
+        document.querySelector('body .drag-tree-node')?.remove();
         document.body.appendChild(dragItem);
 
-        e.dataTransfer.setDragImage(dragItem[0], 0, 0);
+        e.dataTransfer.setDragImage(dragItem, 0, 0);
       }
     }
   }
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
index ff856dce2..74c648f21 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
@@ -349,6 +349,7 @@ export function JsonTextEditor({row, column, onRowChange, onClose}) {
     return newVal;
   });
   const [localVal, setLocalVal] = React.useState(value);
+  const [hasError, setHasError] = React.useState(false);
 
   const onChange = React.useCallback((newVal)=>{
     setLocalVal(newVal);
@@ -358,6 +359,10 @@ export function JsonTextEditor({row, column, onRowChange, onClose}) {
       onClose(false);
       return;
     }
+    if(hasError) {
+      Notifier.error(gettext('Invalid JSON input'));
+      return;
+    }
     onRowChange({ ...row, [column.key]: localVal}, true);
     onClose();
   };
@@ -370,7 +375,7 @@ export function JsonTextEditor({row, column, onRowChange, onClose}) {
           value={localVal}
           options={{
             onChange: onChange,
-            onError: (error)=>Notifier.error('Invalid Json: ' + error.message.split(':')[0]),
+            onValidationError: (errors)=>{setHasError(Boolean(errors.length));}
           }}
           className={'jsoneditor-div'}
         />
diff --git a/web/yarn.lock b/web/yarn.lock
index b0da01871..db0331fe4 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -6268,13 +6268,6 @@ json5@^2.1.2, json5@^2.2.2:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsoneditor-react@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz#bc36356ac5ecb0d8f88d49a5ccbeecdd7f996164"
-  integrity sha512-XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA==
-  dependencies:
-    prop-types "^15.7.2"
-
 jsoneditor@^9.5.4:
   version "9.9.2"
   resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.9.2.tgz#176112f71acbf37e977aae8656a17bc33a7a4269"