diff --git a/deepomatic/api/client.py b/deepomatic/api/client.py
index f41a20b..a9e699d 100644
--- a/deepomatic/api/client.py
+++ b/deepomatic/api/client.py
@@ -56,8 +56,6 @@ def __init__(self, *args, **kwargs):
            :param user_agent_prefix (optional): Prefix the HTTP User-Agent.
                It is recommended to declare your client via this parameter. Example: 'my-app/1.0.0'.
            :type user_agent_prefix: string
-           :param user_agent_suffix (optional): Suffix the HTTP User-Agent.
-           :type user_agent_suffix: string
            :param pool_maxsize (optional): Set `requests.adapters.HTTPAdapter.pool_maxsize` for concurrent calls.
                Defaults to 20.
            :type pool_maxsize: int
diff --git a/deepomatic/api/http_helper.py b/deepomatic/api/http_helper.py
index 3dadbd9..02dd1b8 100644
--- a/deepomatic/api/http_helper.py
+++ b/deepomatic/api/http_helper.py
@@ -50,7 +50,7 @@ class RequestsTimeout(object):
 class HTTPHelper(object):
     def __init__(self, app_id=None, api_key=None, verify_ssl=None,
                  host=None, version=API_VERSION, check_query_parameters=True,
-                 user_agent_prefix='', user_agent_suffix='', pool_maxsize=20,
+                 user_agent_prefix='', pool_maxsize=20,
                  requests_timeout=RequestsTimeout.FAST, **kwargs):
         """
         Init the HTTP helper with API key and secret.
@@ -95,16 +95,18 @@ def __init__(self, app_id=None, api_key=None, verify_ssl=None,
             'platform': platform.platform()
         }
 
+        user_agent_list = []
+
         if user_agent_prefix:
-            self.user_agent = user_agent_prefix + ' '
-        else:
-            self.user_agent = ''
+            user_agent_list.append(user_agent_prefix)
 
-        self.user_agent += '{package_title}-python-client/{package_version} requests/{requests_version} python/{python_version} platform/{platform}\
-            '.format(**user_agent_params)
+        user_agent_list += [
+            '{package_title}-python-client/{package_version}',
+            'requests/{requests_version}',
+            'python/{python_version} platform/{platform}',
+        ]
 
-        if user_agent_suffix:
-            self.user_agent += ' ' + user_agent_suffix
+        self.user_agent = ' '.join(user_agent_list).format(**user_agent_params)
 
         self.api_key = str(api_key)
         self.app_id = str(app_id)