diff --git a/ui/userOp/UserOpCallData.tsx b/ui/userOp/UserOpCallData.tsx
index 6018606597..08e962f696 100644
--- a/ui/userOp/UserOpCallData.tsx
+++ b/ui/userOp/UserOpCallData.tsx
@@ -23,21 +23,22 @@ const UserOpDecodedCallData = ({ data }: Props) => {
     return null;
   }
 
-  const toggler = data.call_data ? (
+  const toggler = data.call_data && data.execute_call_data ? (
     <UserOpCallDataSwitch
       onChange={ handleSwitchChange }
-      initialValue={ !data.execute_call_data }
-      isDisabled={ !data.execute_call_data }
+      initialValue={ false }
       ml={{ base: 3, lg: 'auto' }}
     />
   ) : null;
 
+  const labelText = data.call_data && !data.execute_call_data ? 'External call data' : 'Call data';
+
   return (
     <>
       <DetailsInfoItem.Label
         hint="Data that’s passed to the sender for execution"
       >
-        Call data
+        { labelText }
       </DetailsInfoItem.Label>
       <DetailsInfoItem.Value>
         <RawInputData hex={ callData } rightSlot={ toggler }/>
diff --git a/ui/userOp/UserOpDecodedCallData.tsx b/ui/userOp/UserOpDecodedCallData.tsx
index 19884ccc72..c896a23836 100644
--- a/ui/userOp/UserOpDecodedCallData.tsx
+++ b/ui/userOp/UserOpDecodedCallData.tsx
@@ -23,21 +23,22 @@ const UserOpDecodedCallData = ({ data }: Props) => {
     return null;
   }
 
-  const toggler = data.decoded_call_data ? (
+  const toggler = data.decoded_call_data && data.decoded_execute_call_data ? (
     <UserOpCallDataSwitch
       onChange={ handleSwitchChange }
-      initialValue={ !data.decoded_execute_call_data }
-      isDisabled={ !data.decoded_execute_call_data }
+      initialValue={ false }
       ml={{ base: 0, lg: 'auto' }}
     />
   ) : null;
 
+  const labelText = data.call_data && !data.execute_call_data ? 'Decoded external call data' : 'Decoded call data';
+
   return (
     <>
       <DetailsInfoItem.Label
-        hint="Decoded call data"
+        hint={ labelText }
       >
-        Decoded call data
+        { labelText }
       </DetailsInfoItem.Label>
       <DetailsInfoItem.Value
         flexDir={{ base: 'column', lg: 'row' }}