diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
index 0432cc5853..f3575d914a 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
@@ -335,9 +335,7 @@ export const JSONNode = ({ data, ...restProps }) => {
 
       <div
         style={{ width: 'inherit' }}
-        className={`${shouldDisplayIntendedBlock && 'group-border'} ${applySelectedNodeStyles && 'selected-node'} ${
-          shouldDisplayIntendedBlock && !applySelectedNodeStyles && 'border-0'
-        }`}
+        className={`${shouldDisplayIntendedBlock && 'group-border'} ${applySelectedNodeStyles && 'selected-node'} `}
       >
         <div
           className={cx('d-flex', {
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNodeIndicator.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNodeIndicator.jsx
index b4cebc69c7..92b2d47fbf 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNodeIndicator.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNodeIndicator.jsx
@@ -21,6 +21,8 @@ const JSONTreeNodeIndicator = ({ toExpand, toShowNodeIndicator, handleToggle, ..
   };
 
   const handleToggleForNode = () => {
+    if (!toExpandNode) return;
+
     if (toExpandWithLabels) {
       return toggleWithLabels(data, currentNode, path);
     }