diff --git a/picard/webservice/api_helpers.py b/picard/webservice/api_helpers.py
index f43de8f6a..6b92bc082 100644
--- a/picard/webservice/api_helpers.py
+++ b/picard/webservice/api_helpers.py
@@ -271,22 +271,16 @@ class AcoustIdAPIHelper(APIHelper):
             self.acoustid_host, self.acoustid_port, '/v2/', webservice
         )
 
-    @staticmethod
-    def _static_encode_acoustid_args(args, client_key, client_version, format_):
+    def _encode_acoustid_args(self, args):
         filters = []
-        args['client'] = client_key
-        args['clientversion'] = client_version
-        args['format'] = format_
+        args['client'] = self.client_key
+        args['clientversion'] = self.client_version
+        args['format'] = 'json'
         for name, value in args.items():
             value = bytes(QUrl.toPercentEncoding(value)).decode()
             filters.append('%s=%s' % (name, value))
         return '&'.join(filters)
 
-    def _encode_acoustid_args(self, args):
-        return self._static_encode_acoustid_args(
-            args, self.client_key, self.client_version, format_='json'
-        )
-
     def query_acoustid(self, handler, **args):
         path_list = ('lookup', )
         body = self._encode_acoustid_args(args)
diff --git a/test/test_api_helpers.py b/test/test_api_helpers.py
index 198637ebf..88d36600b 100644
--- a/test/test_api_helpers.py
+++ b/test/test_api_helpers.py
@@ -205,22 +205,18 @@ class AcoustdIdAPITest(PicardTestCase):
         self.api = AcoustIdAPIHelper(self.ws)
         self.api.acoustid_host = 'acoustid_host'
         self.api.acoustid_port = 443
-        self.api.client_key = "client_key"
-        self.api.client_version = "client_version"
+        self.api.client_key = "key"
+        self.api.client_version = "ver"
 
     def test_encode_acoustid_args_static(self):
         args = {'a': '1', 'b': 'v a l'}
-        result = self.api._static_encode_acoustid_args(
-            args, 'key', 'ver', 'json'
-        )
+        result = self.api._encode_acoustid_args(args)
         expected = 'a=1&b=v%20a%20l&client=key&clientversion=ver&format=json'
         self.assertEqual(result, expected)
 
     def test_encode_acoustid_args_static_empty(self):
         args = dict()
-        result = self.api._static_encode_acoustid_args(
-            args, 'key', 'ver', 'json'
-        )
+        result = self.api._encode_acoustid_args(args)
         expected = 'client=key&clientversion=ver&format=json'
         self.assertEqual(result, expected)