diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a34277eb0..65275597c 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -476,7 +476,7 @@
                 <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
               </div>
               <div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
-                <button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || home.paymentExpired"
+                <button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || (home.paymentExpired && home.usePaypro)"
                   ng-style="{'background-color':index.backgroundColor}"  translate>
                   Send
                 </button>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index f0da81f2c..176a21621 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -28,6 +28,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   this.addr = {};
   this.lockedCurrentFeePerKb = null;
   self.paymentExpired = true;
+  self.usePaypro = false;
 
   var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
     self.setForm(data);
@@ -949,6 +950,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   this.resetForm = function() {
     this.resetError();
     self.paymentExpired = true;
+    self.usePaypro = false;
     this._paypro = null;
     this.lockedCurrentFeePerKb = null;
 
@@ -1068,9 +1070,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   function _countDownPaymentTime(time){
+    self.usePaypro = true;
     self.paymentExpired = false;
-    // self.timeToExpire = time;
-    self.timeToExpire = (Math.floor(Date.now()/1000) + 10);
+    self.timeToExpire = time;
+    // self.timeToExpire = (Math.floor(Date.now()/1000) + 10);
     var countDown = $interval(function(){
       self.timeToExpire--;
       if(self.timeToExpire <= Math.floor(Date.now() / 1000)){