diff --git a/pycsw/server.py b/pycsw/server.py
index 917525240..00bc49782 100644
--- a/pycsw/server.py
+++ b/pycsw/server.py
@@ -34,7 +34,7 @@
 
 import logging
 import os
-from urllib.parse import parse_qsl, splitquery, urlparse
+from urllib.parse import parse_qsl, urlparse
 from io import StringIO
 import sys
 from time import time
@@ -239,7 +239,7 @@ def dispatch_wsgi(self):
                     LOGGER.debug('Looks like an OpenSearch URL template')
                     query_part = self.request.split('?', 1)[-1]
                 else:
-                    query_part = splitquery(self.request)[-1]
+                    query_part = urlparse(self.request).query
                 self.kvp = dict(parse_qsl(query_part, keep_blank_values=True))
             except AttributeError as err:
                 LOGGER.exception('Could not parse query string')