diff --git a/ui/desktop/app/services/origin.js b/ui/desktop/app/services/origin.js
index c6f6a4580..c3e27c358 100644
--- a/ui/desktop/app/services/origin.js
+++ b/ui/desktop/app/services/origin.js
@@ -63,11 +63,11 @@ export default class OriginService extends Service {
       typeof origin === 'string'
     );
     try {
-      // Silently drop trailing slashes if present.
+      // Trim whitespaces and silently drop trailing slashes if present.
       // This is important since API paths that will be appended to the origin
       // will include preceeding slashes already.
-      // Trim whitespaces around origin.
-      origin = origin.replace(/\/*$/, '').trim();
+      origin = origin.trim();
+      origin = origin.replace(/\/*$/, '');
       this.adapter.host = origin;
       this.rendererOrigin = origin;
       if (origin !== (await this.mainOrigin)) {
diff --git a/ui/desktop/tests/unit/services/origin-test.js b/ui/desktop/tests/unit/services/origin-test.js
index 88746b92a..7c759713f 100644
--- a/ui/desktop/tests/unit/services/origin-test.js
+++ b/ui/desktop/tests/unit/services/origin-test.js
@@ -39,7 +39,7 @@ module('Unit | Service | origin', function (hooks) {
   test('trim spaces from origin on setOrigin', async function (assert) {
     assert.expect(4);
     sinon.stub(ipcService, 'invoke');
-    await service.setOrigin(` ${window.location.origin} `);
+    await service.setOrigin(` ${window.location.origin}/ `);
     assert.equal(service.rendererOrigin, window.location.origin);
     assert.equal(service.adapter.host, window.location.origin);
     await service.setOrigin(`   ${window.location.origin}   `);