diff --git a/aircox/views/episode.py b/aircox/views/episode.py
index fc0d45f..5c16c31 100644
--- a/aircox/views/episode.py
+++ b/aircox/views/episode.py
@@ -59,7 +59,7 @@ class EpisodeUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
         return reverse("episode-detail", kwargs={"slug": self.get_object().slug})
 
     def get_tracklist_queryset(self, episode):
-        return Track.objects.filter(episode=episode)
+        return Track.objects.filter(episode=episode).order_by("position")
 
     def get_tracklist_formset(self, episode, **kwargs):
         kwargs.update(
@@ -74,7 +74,7 @@ class EpisodeUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
         return forms.TrackFormSet(**kwargs)
 
     def get_soundlist_queryset(self, episode):
-        return episode.sound_set.all()
+        return episode.sound_set.all().order_by("position")
 
     def get_soundlist_formset(self, episode, **kwargs):
         kwargs.update(