diff --git a/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.html b/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.html
index c74168837..2eed561e2 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.html
+++ b/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.html
@@ -6,13 +6,16 @@
 			</ion-label>
 			<ion-checkbox
 				slot="start"
-				#isPaymentEnabled="ngModel"
+				(click)="hasChanged = true"
 				[(ngModel)]="currWarehouse.isPaymentEnabled"
 			>
 			</ion-checkbox>
 		</ion-item>
 	</ion-col>
-	<ion-col class="col-3">
+	<ion-col
+		*ngIf="currWarehouse.isPaymentEnabled && showPaymentsGateways"
+		class="col-3"
+	>
 		<ng-select
 			[items]="myPaymentsGateways"
 			[clearable]="false"
@@ -47,7 +50,10 @@
 			</ng-template>
 		</ng-select>
 	</ion-col>
-	<ion-col class="col-3">
+	<ion-col
+		*ngIf="currWarehouse.isPaymentEnabled && showPaymentsGateways"
+		class="col-3"
+	>
 		<ng-select
 			[items]="paymentsGateways"
 			[clearable]="false"
diff --git a/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.ts b/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.ts
index d8867941c..9c08d8bfa 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.ts
+++ b/merchant/tablet-ionic/src/components/settings-page-components/settings/payments/payments.ts
@@ -13,9 +13,8 @@ export class SettingsPaymentsComponent implements OnInit {
 	@Input()
 	currWarehouse: Warehouse;
 
-	@ViewChild('isPaymentEnabled', { static: false })
-	isPaymentEnabled: ElementRef;
-
+	showPaymentsGateways: boolean;
+	hasChanged: boolean;
 	myPaymentsGateways = [];
 	paymentsGateways = [];
 	selectedMyPaymentsGateways: PaymentGateways[];
@@ -38,6 +37,8 @@ export class SettingsPaymentsComponent implements OnInit {
 		this.paymentsGateways = allPaymentGateways.filter(
 			(pg) => !this.myPaymentsGateways.includes(pg)
 		);
+
+		this.showPaymentsGateways = true;
 	}
 
 	getPaymentName(p: PaymentGateways) {
diff --git a/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.html b/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.html
index 5256d7163..ce484bbd4 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.html
+++ b/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.html
@@ -44,7 +44,6 @@ <h4 class="row-title">
 		<merchant-payments-settings
 			[currWarehouse]="currWarehouse"
 			#paymentsSettings
-			*ngIf="showPayments"
 		>
 		</merchant-payments-settings>
 
@@ -116,7 +115,7 @@ <h4 class="row-title">
 				<ion-button
 					[disabled]="
 						hasChanges(
-							paymentsSettings?.isPaymentEnabled.dirty,
+							paymentsSettings.hasChanged,
 							productsDelivery.dirty,
 							productsTakeaway.dirty,
 							orderBarcodeType.dirty,
@@ -127,8 +126,7 @@ <h4 class="row-title">
 					(click)="saveChanges()"
 					color="success"
 				>
-					{{ paymentsSettings | json }} {{
-					'SETTINGS_VIEW.SAVE_CHANGES' | translate }}
+					{{ 'SETTINGS_VIEW.SAVE_CHANGES' | translate }}
 				</ion-button>
 			</ion-col>
 		</ion-row>
diff --git a/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.ts b/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.ts
index fdc4bbebb..574f01f2e 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.ts
+++ b/merchant/tablet-ionic/src/components/settings-page-components/settings/settings.ts
@@ -1,4 +1,4 @@
-import { Component, Input, AfterViewInit } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import OrderBarcodeTypes, {
 	orderBarcodeTypesToString
@@ -26,8 +26,6 @@ export class SettingsComponent implements AfterViewInit {
 		OrderBarcodeTypes.pharmacode
 	];
 
-	// TODO
-	// paymentsEnabled: boolean;
 	selectedOrderBarcodeType: OrderBarcodeTypes;
 	barcodetDataUrl: string;
 	hasScanCode: boolean;