diff --git a/api/Dockerfile b/api/Dockerfile
index 92a4d7f49..c735ab397 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -25,15 +25,18 @@ RUN \
 
 RUN mkdir /requirements
 COPY ./requirements/base.txt /requirements/base.txt
+# hack around https://github.com/pypa/pip/issues/6158#issuecomment-456619072
+ENV PIP_DOWNLOAD_CACHE=/noop/
 RUN \
     echo 'fixing requirements file for alpine' && \
     sed -i '/Pillow/d' /requirements/base.txt && \
     \
     \
     echo 'installing pip requirements' && \
-    pip3 install --no-cache-dir --upgrade pip && \
-    pip3 install --no-cache-dir setuptools wheel && \
-    pip3 install --no-cache-dir -r /requirements/base.txt
+    pip3 install --upgrade pip && \
+    pip3 install setuptools wheel && \
+    pip3 install -r /requirements/base.txt && \
+    rm -rf $PIP_DOWNLOAD_CACHE
 
 ARG install_dev_deps=0
 COPY ./requirements/*.txt /requirements/
diff --git a/api/funkwhale_api/music/admin.py b/api/funkwhale_api/music/admin.py
index fca544cc8..b2f001527 100644
--- a/api/funkwhale_api/music/admin.py
+++ b/api/funkwhale_api/music/admin.py
@@ -20,7 +20,7 @@ class AlbumAdmin(admin.ModelAdmin):
 class TrackAdmin(admin.ModelAdmin):
     list_display = ["title", "artist", "album", "mbid"]
     search_fields = ["title", "artist__name", "album__title", "mbid"]
-    list_select_related = True
+    list_select_related = ["album__artist", "artist"]
 
 
 @admin.register(models.ImportBatch)
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index d004a7044..e770b3882 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -42,7 +42,7 @@ ipython>=6,<7
 mutagen>=1.42,<1.43
 
 
-django-taggit>=0.22,<0.23
+django-taggit>=0.23,<0.24
 pymemoize==1.0.3
 
 django-dynamic-preferences>=1.7,<1.8
diff --git a/changes/changelog.d/666.bugfix b/changes/changelog.d/666.bugfix
new file mode 100644
index 000000000..5027dd403
--- /dev/null
+++ b/changes/changelog.d/666.bugfix
@@ -0,0 +1 @@
+Fixed crashing Django admin when loading track detail page (#666)