diff --git a/jellyfin_kodi/entrypoint/default.py b/jellyfin_kodi/entrypoint/default.py
index 26079504..32ab68eb 100644
--- a/jellyfin_kodi/entrypoint/default.py
+++ b/jellyfin_kodi/entrypoint/default.py
@@ -6,8 +6,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 import json
 import sys
 import os
+from urllib.parse import parse_qsl, urlencode
 
-from six.moves.urllib.parse import parse_qsl, urlencode
 from kodi_six import xbmc, xbmcvfs, xbmcgui, xbmcplugin, xbmcaddon
 
 from .. import client
diff --git a/jellyfin_kodi/helper/utils.py b/jellyfin_kodi/helper/utils.py
index 45410966..eea2ae26 100644
--- a/jellyfin_kodi/helper/utils.py
+++ b/jellyfin_kodi/helper/utils.py
@@ -10,10 +10,10 @@ import sys
 import re
 import unicodedata
 from uuid import uuid4
+from urllib.parse import quote_plus
 
 from dateutil import tz, parser
 from six import text_type, string_types, ensure_text, ensure_binary
-from six.moves.urllib.parse import quote_plus
 
 from kodi_six import xbmc, xbmcaddon, xbmcgui, xbmcvfs
 
diff --git a/jellyfin_kodi/objects/movies.py b/jellyfin_kodi/objects/movies.py
index 44927b69..58b96059 100644
--- a/jellyfin_kodi/objects/movies.py
+++ b/jellyfin_kodi/objects/movies.py
@@ -3,7 +3,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 
 ##################################################################################################
 
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
+
 from kodi_six.utils import py2_encode
 
 from .. import downloader as server
diff --git a/jellyfin_kodi/objects/musicvideos.py b/jellyfin_kodi/objects/musicvideos.py
index c2d280e4..1157f75a 100644
--- a/jellyfin_kodi/objects/musicvideos.py
+++ b/jellyfin_kodi/objects/musicvideos.py
@@ -5,8 +5,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 
 import datetime
 import re
+from urllib.parse import urlencode
 
-from six.moves.urllib.parse import urlencode
 from kodi_six.utils import py2_encode
 
 from ..database import jellyfin_db, queries as QUEM
diff --git a/jellyfin_kodi/objects/tvshows.py b/jellyfin_kodi/objects/tvshows.py
index 09485509..02016cf3 100644
--- a/jellyfin_kodi/objects/tvshows.py
+++ b/jellyfin_kodi/objects/tvshows.py
@@ -5,8 +5,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 
 import sqlite3
 from ntpath import dirname
+from urllib.parse import urlencode
 
-from six.moves.urllib.parse import urlencode
 from kodi_six.utils import py2_encode
 
 from .. import downloader as server
diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py
index 6a72a2b6..d13cec4c 100644
--- a/jellyfin_kodi/views.py
+++ b/jellyfin_kodi/views.py
@@ -5,8 +5,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 
 import os
 import xml.etree.ElementTree as etree
+from urllib.parse import urlencode
 
-from six.moves.urllib.parse import urlencode
 from kodi_six import xbmcvfs
 
 from .database import Database, jellyfin_db, get_sync, save_sync