diff --git a/torba/tests/client_tests/integration/test_network.py b/torba/tests/client_tests/integration/test_network.py
index afe8b9692..76e834846 100644
--- a/torba/tests/client_tests/integration/test_network.py
+++ b/torba/tests/client_tests/integration/test_network.py
@@ -30,7 +30,7 @@ class NetworkTests(IntegrationTestCase):
                           'server_version': '0.5.7'}, await self.ledger.network.get_server_features())
         await self.conductor.spv_node.stop()
         address = (await self.account.get_addresses(limit=1))[0]
-        os.environ.update({'DESCRIPTION': 'Fastest server in the west.', 'PAYMENT_ADDRESS': address, 'DAILY_FEE': '42'})
+        os.environ.update({'DESCRIPTION': 'Fastest server in the west.', 'DONATION_ADDRESS': address, 'DAILY_FEE': '42'})
         await self.conductor.spv_node.start(self.conductor.blockchain_node)
         await self.ledger.network.on_connected.first
         self.assertEqual({'genesis_hash': self.conductor.spv_node.coin_class.GENESIS_HASH,
diff --git a/torba/torba/server/env.py b/torba/torba/server/env.py
index eb7327a6f..196ef6c6e 100644
--- a/torba/torba/server/env.py
+++ b/torba/torba/server/env.py
@@ -81,7 +81,6 @@ class Env:
         self.session_timeout = self.integer('SESSION_TIMEOUT', 600)
         self.drop_client = self.custom("DROP_CLIENT", None, re.compile)
         self.description = self.default('DESCRIPTION', '')
-        self.payment_address = self.default('PAYMENT_ADDRESS', '')
         self.daily_fee = self.integer('DAILY_FEE', 0)
 
         # Identities
diff --git a/torba/torba/server/session.py b/torba/torba/server/session.py
index ffad44fdd..e9e1840fc 100644
--- a/torba/torba/server/session.py
+++ b/torba/torba/server/session.py
@@ -768,7 +768,7 @@ class ElectrumX(SessionBase):
             'protocol_max': max_str,
             'genesis_hash': env.coin.GENESIS_HASH,
             'description': env.description,
-            'payment_address': env.payment_address,
+            'payment_address': env.donation_address,
             'daily_fee': env.daily_fee,
             'hash_function': 'sha256',
         }