diff --git a/supysonic/managers/user.py b/supysonic/managers/user.py
index 8643d2e..e9042c1 100644
--- a/supysonic/managers/user.py
+++ b/supysonic/managers/user.py
@@ -76,7 +76,6 @@ class UserManager:
         store.find(RatingTrack,  RatingTrack.user_id  == user.id).remove()
         store.find(ChatMessage, ChatMessage.user_id == user.id).remove()
         for playlist in store.find(Playlist, Playlist.user_id == user.id):
-            playlist.tracks.clear()
             store.remove(playlist)
 
         store.remove(user)
diff --git a/supysonic/templates/playlist.html b/supysonic/templates/playlist.html
index f9d22f4..84c0f2e 100644
--- a/supysonic/templates/playlist.html
+++ b/supysonic/templates/playlist.html
@@ -39,7 +39,7 @@
     <tr><th>Artist</th><th>Title</th><th>Album</th><th>Length</th></tr>
   </thead>
   <tbody>
-    {% for t in playlist.tracks %}
+    {% for t in playlist.get_tracks() %}
     <tr><td>{{ t.album.artist.name }}</td><td>{{ t.title }}</td><td>{{ t.album.name }}</td><td>{{ t.duration_str() }}</td></tr>
     {% endfor %}
   </tbody>
diff --git a/supysonic/templates/playlists.html b/supysonic/templates/playlists.html
index b3f6cc9..31314ed 100644
--- a/supysonic/templates/playlists.html
+++ b/supysonic/templates/playlists.html
@@ -27,7 +27,7 @@
     {% for p in mine %}
     <tr>
       <td><a href="{{ url_for('playlist_details', uid = p.id) }}">{{ p.name }}</a></td>
-      <td>{{ p.tracks.count() }}</td>
+      <td>{{ p.get_tracks()|length }}</td>
       <td>{% if p.public %}<span class="glyphicon glyphicon-check"
                                  aria-label="Public playlist"></span>{% else %}<span
                                  class="glyphicon glyphicon-unchecked"
@@ -52,7 +52,7 @@
     <tr>
       <td><a href="{{ url_for('playlist_details', uid = p.id) }}">{{ p.name }}</a></td>
       <td>{{ p.user.name }}</td>
-      <td>{{ p.tracks.count() }}</td>
+      <td>{{ p.get_tracks()|length }}</td>
     </tr>
     {% endfor %}
   </tbody>