diff --git a/src/packages/administrativo/components/TPessoa/TPessoaTableFormSubview.tsx b/src/packages/administrativo/components/TPessoa/TPessoaTableFormSubview.tsx
index f352847..5d94eee 100644
--- a/src/packages/administrativo/components/TPessoa/TPessoaTableFormSubview.tsx
+++ b/src/packages/administrativo/components/TPessoa/TPessoaTableFormSubview.tsx
@@ -62,13 +62,13 @@ function TPessoaTableFormSubview({
           </ItemTitle>
           <ItemDescription>{data.pessoa?.email || 'Email não informado'}</ItemDescription>
           {params
-            .filter((param) => Number(param.valor) === data.servico.servico_tipo_id)
+            .filter((param) => Number(param.valor) === data?.servico?.servico_tipo_id)
             .map((param) => (
               <TPessoaCartaoForm form={form} index={item_index} key={param.config_id} />
             ))}
         </ItemContent>
         <ItemActions>
-          {data.servico.requer_biometria === 'S' && (
+          {data?.servico?.requer_biometria === 'S' && (
             <Button
               type="button"
               size="icon-lg"
@@ -82,7 +82,7 @@ function TPessoaTableFormSubview({
               <FingerprintIcon />
             </Button>
           )}
-          {data.servico.requer_biometria && (
+          {data?.servico?.requer_biometria && (
             <Button
               type="button"
               size="icon-lg"
diff --git a/src/packages/administrativo/services/GCalculo/GCalculoServicoService.ts b/src/packages/administrativo/services/GCalculo/GCalculoServicoService.ts
index adf47f8..ee75880 100644
--- a/src/packages/administrativo/services/GCalculo/GCalculoServicoService.ts
+++ b/src/packages/administrativo/services/GCalculo/GCalculoServicoService.ts
@@ -31,11 +31,15 @@ async function executeGCalculoServicoService(
     taxa_judiciaria: response.data.taxa_judiciaria ?? 0,
     valor_iss: response.data.valor_iss ?? 0,
     pessoa_id: data?.pessoa?.pessoa_id ?? null,
-    subview: {
+    subview: {}
+  };
+
+  if (data?.pessoa?.pessoa_id) {
+    item.subview = {
       servico: data.servico_tipo,
       pessoa: data.pessoa,
-    },
-  };
+    }
+  }
 
   return item;
 }
diff --git a/src/packages/servicos/actions/TServicoPedido/HandleSelectTServicoTipoAction.ts b/src/packages/servicos/actions/TServicoPedido/HandleSelectTServicoTipoAction.ts
index d217baf..aedae39 100644
--- a/src/packages/servicos/actions/TServicoPedido/HandleSelectTServicoTipoAction.ts
+++ b/src/packages/servicos/actions/TServicoPedido/HandleSelectTServicoTipoAction.ts
@@ -6,6 +6,7 @@ export default function HandleSelectTServicoTipoAction({
   onOpenPessoaForm,
   onAddItem,
 }: HandleSelectTServicoTipoInterface) {
+
   if (!servico || !emolumento) {
     return {
       status: 422,
diff --git a/src/packages/servicos/components/TServicoItemPedido/TServicoItemPedidoFormTable.tsx b/src/packages/servicos/components/TServicoItemPedido/TServicoItemPedidoFormTable.tsx
index ecaf127..0c1cdd0 100644
--- a/src/packages/servicos/components/TServicoItemPedido/TServicoItemPedidoFormTable.tsx
+++ b/src/packages/servicos/components/TServicoItemPedido/TServicoItemPedidoFormTable.tsx
@@ -22,6 +22,7 @@ function TServicoItemPedidoFormTableComponent({
   form,
   params,
 }: TServicoItemPedidoFormTableInterface) {
+  console.log(data)
   return (
     <div className="rounded-md border">
       <Table>
diff --git a/src/packages/servicos/components/TServicoPedido/TServicoPedidoForm.tsx b/src/packages/servicos/components/TServicoPedido/TServicoPedidoForm.tsx
index f0c81a1..7b412c0 100644
--- a/src/packages/servicos/components/TServicoPedido/TServicoPedidoForm.tsx
+++ b/src/packages/servicos/components/TServicoPedido/TServicoPedidoForm.tsx
@@ -254,6 +254,7 @@ export default function TServicoPedidoForm({ servico_pedido_id }: TServicoPedido
 
   // Adiciona o item a tabela e verifica se deve ou não montar a subview da linha da tabela
   const handleSelectServicoTipo = useCallback(() => {
+
     const response = HandleSelectTServicoTipoAction({
       servico: selectedServicoTipo,
       emolumento: selectedEmolumento,
@@ -265,6 +266,7 @@ export default function TServicoPedidoForm({ servico_pedido_id }: TServicoPedido
     if (response?.status) {
       setResponse(response);
     }
+
   }, [selectedServicoTipo, selectedEmolumento, handleOpenPessoaForm, handleAddItemBasic]);
 
   // Cálculo automático dos totais
diff --git a/src/packages/servicos/hooks/TServicoItemPedido/useTServicoItemPedidoCalculoHook.ts b/src/packages/servicos/hooks/TServicoItemPedido/useTServicoItemPedidoCalculoHook.ts
index 790f705..13b4164 100644
--- a/src/packages/servicos/hooks/TServicoItemPedido/useTServicoItemPedidoCalculoHook.ts
+++ b/src/packages/servicos/hooks/TServicoItemPedido/useTServicoItemPedidoCalculoHook.ts
@@ -34,9 +34,11 @@ export function useTServicoItemPedidoCalculoHook<TFormValues extends FieldValues
     }
 
     setTServicoItemPedido((prev) => {
+
       const safePrev = Array.isArray(prev) ? prev : [];
 
-      const novoItem = response?.data as TServicoItemPedidoCalculoResponseInterface;
+      const novoItem = response;
+
       if (!novoItem) return safePrev;
 
       const novoArray = [...safePrev, novoItem];
@@ -50,9 +52,10 @@ export function useTServicoItemPedidoCalculoHook<TFormValues extends FieldValues
       }
 
       return novoArray;
+
     });
 
-    return response?.data;
+    return response;
   };
 
   return {