diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 08e77ac5b..ecc19aa91 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -16,7 +16,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
-import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index 539eb408c..a8d8db930 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -178,7 +178,7 @@ export function TimeTicketModalContainer({
             onCancel={handleCancel}
             afterClose={() => form.resetFields()}
             footer={
-                <span>
+                <Space>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
           <Button
               loading={loading}
@@ -198,7 +198,7 @@ export function TimeTicketModalContainer({
                             {t("general.actions.saveandnew")}
                         </Button>
                     )}
-        </span>
+        </Space>
             }
             destroyOnClose
         >
@@ -229,9 +229,12 @@ export function TimeTicketModalContainer({
                 <PageHeader
                     extra={
                         <Space>
+                        {
+                          Enhanced_Payroll.treatment === 'on' && 
                             <TimeTicketsCommitToggleComponent
                                 timeticket={timeTicketModal.context?.timeticket}
                             />
+                        }
                             <Button onClick={handleCancel}>
                                 {t("general.actions.cancel")}
                             </Button>