diff --git a/src/views/app.js b/src/views/app.js
index 2e80da7f0..583963100 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1053,7 +1053,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.proxy.busy = true;
             $scope.proxy.error = {};
 
-            Client.configureApp($scope.app.id, 'upstream_uri', { upstreamUri: $scope.proxy.upstreamUri }, function (error) {
+            var upstreamUri = $scope.proxy.upstreamUri.replace(/\/$/, '');
+            Client.configureApp($scope.app.id, 'upstream_uri', { upstreamUri: upstreamUri }, function (error) {
                 if (error) return Client.error(error);
 
                 $timeout(function () {
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 4bea8c081..3cd59239a 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -277,7 +277,10 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
                 sso: !$scope.appInstall.optionalSso ? undefined : ($scope.appInstall.accessRestrictionOption !== 'nosso'),
             };
 
-            if ($scope.appInstall.upstreamUri) data.upstreamUri = $scope.appInstall.upstreamUri;
+            if ($scope.appInstall.upstreamUri) {
+                data.upstreamUri = $scope.appInstall.upstreamUri;
+                data.upstreamUri = data.upstreamUri.replace(/\/$/, '');
+            }
 
             var domains = [];
             domains.push({ subdomain: data.subdomain, domain: data.domain, type: 'primary' });