diff --git a/www/js/pages/trade/components/chart/chart.controller.js b/www/js/pages/trade/components/chart/chart.controller.js
index bd09cd9f71..96a9d97767 100644
--- a/www/js/pages/trade/components/chart/chart.controller.js
+++ b/www/js/pages/trade/components/chart/chart.controller.js
@@ -19,27 +19,6 @@
             chartService.destroy();
         });
 
-        $scope.$on("portfolio", (e, portfolio) => {
-            const contractId = vm.purchasedContract.contractId;
-
-            if ((typeof contractId === "string" && !_.isEmpty(contractId)) || contractId) {
-                portfolio.contracts.forEach(contract => {
-                    if ((typeof contractId === "string" && contract.contract_id.toString() === contractId) || contract.contract_id === contractId) {
-                        chartService.addContract({
-                            startTime: contract.date_start + 1,
-                            duration : parseInt(vm.proposal.duration),
-                            type     :
-                                vm.proposal.tradeType === "Higher/Lower"
-                                    ? `${contract.contract_type}HL`
-                                    : contract.contract_type,
-                            selectedTick: vm.proposal.tradeType === "High/Low Ticks" ? vm.proposal.selected_tick : null,
-                            barrier     : vm.proposal.barrier
-                        });
-                    }
-                });
-            }
-        });
-
         $scope.$on("tick", (e, feed) => {
             if (feed && feed.echo_req.ticks_history === vm.proposal.symbol) {
                 chartService.historyInterface.addTick(feed.tick);
diff --git a/www/js/pages/trade/components/purchase/purchase.controller.js b/www/js/pages/trade/components/purchase/purchase.controller.js
index 18a01b2e47..818913aa2a 100644
--- a/www/js/pages/trade/components/purchase/purchase.controller.js
+++ b/www/js/pages/trade/components/purchase/purchase.controller.js
@@ -17,6 +17,7 @@
         "appStateService",
         "proposalService",
         "websocketService",
+        "chartService",
         "$ionicLoading"
     ];
 
@@ -27,6 +28,7 @@
         appStateService,
         proposalService,
         websocketService,
+        chartService,
         $ionicLoading) {
         const vm = this;
         let forgetRequestId = 0;
@@ -39,6 +41,7 @@
         vm.purchasedContractIndex = -1;
         vm.currencyType = "fiat";
         vm.isContractFinished = false;
+        vm.contractType = '';
 
         $scope.$watch(
             () => vm.proposal,
@@ -97,21 +100,32 @@
         });
 
         $scope.$on("purchase", (e, response) => {
+            const purchaseInfo = response.buy;
+
             if (!_.isEmpty(response.buy)) {
                 vm.showSummary = true;
                 $scope.$applyAsync(() => {
                     vm.purchasedContract = {
-                        contractId   : response.buy.contract_id,
-                        longcode     : response.buy.longcode,
+                        contractId   : purchaseInfo.contract_id,
+                        longcode     : purchaseInfo.longcode,
                         payout       : vm.proposalResponses[vm.purchasedContractIndex].payout,
-                        cost         : response.buy.buy_price,
-                        balance      : response.buy.balance_after,
-                        transactionId: response.buy.transaction_id,
+                        cost         : purchaseInfo.buy_price,
+                        balance      : purchaseInfo.balance_after,
+                        transactionId: purchaseInfo.transaction_id,
                         profit       : parseFloat(vm.proposalResponses[vm.purchasedContractIndex].payout) -
-                        parseFloat(response.buy.buy_price),
+                        parseFloat(purchaseInfo.buy_price),
                     };
                 });
-                websocketService.sendRequestFor.portfolio();
+                chartService.addContract({
+                    startTime: purchaseInfo.start_time + 1,
+                    duration : parseInt(vm.proposal.duration),
+                    type     :
+                        vm.proposal.tradeType === "Higher/Lower"
+                            ? `${vm.contractType}HL`
+                            : vm.contractType,
+                    selectedTick: vm.proposal.tradeType === "High/Low Ticks" ? vm.proposal.selected_tick : null,
+                    barrier     : vm.proposal.barrier
+                });
             }
         });
 
@@ -149,7 +163,7 @@
                     proposal.underlying_symbol,
                     vm.purchasedContract.payout
                 );
-                
+
                 vm.isContractFinished = true;
                 sendProposal();
             }
@@ -186,7 +200,7 @@
             return `img/trade-icon/${contractType.toLowerCase()}.svg`;
         };
 
-        vm.purchase = function (contractIndex) {
+        vm.purchase = function (contractIndex, contract_type) {
             $scope.$applyAsync(() => {
                 vm.isContractFinished = false;
                 vm.inPurchaseMode = true;
@@ -194,6 +208,9 @@
                 appStateService.purchaseMode = true;
                 appStateService.tradeMode = false;
             });
+            if (contract_type) {
+                vm.contractType = contract_type;
+            }
             proposalService.purchase(vm.proposalResponses[contractIndex]);
         };
 
diff --git a/www/js/pages/trade/components/purchase/purchase.template.html b/www/js/pages/trade/components/purchase/purchase.template.html
index 99564e7e81..bcb4c84d30 100644
--- a/www/js/pages/trade/components/purchase/purchase.template.html
+++ b/www/js/pages/trade/components/purchase/purchase.template.html
@@ -51,7 +51,7 @@
       </div>
       <div class="row" ng-if="!vm.proposalResponses[$index].hasError">
         <div class="col center">
-          <button class="button button-positive" ng-click="vm.purchase($index)"
+          <button class="button button-positive" ng-click="vm.purchase($index, contract.contract_type)"
                   ng-disabled="vm.inPurchaseMode || vm.proposalResponses[$index].isReceiving || vm.proposalResponses.length == 0"
                   disabled>
             {{ "trade.buy" | translate}}
diff --git a/www/js/share/services/websocket.service.js b/www/js/share/services/websocket.service.js
index e6b448c481..66a212e641 100644
--- a/www/js/share/services/websocket.service.js
+++ b/www/js/share/services/websocket.service.js
@@ -332,6 +332,7 @@ angular
                         buy  : _proposalId,
                         price: price || 0
                     };
+
                     sendMessage(data);
                 },
                 balance() {