diff --git a/marietje/queues/migrations/0006_state_db_index.py b/marietje/queues/migrations/0006_state_db_index.py
new file mode 100644
index 0000000..c14dfec
--- /dev/null
+++ b/marietje/queues/migrations/0006_state_db_index.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.4 on 2018-04-09 15:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('queues', '0005_playlistsong_played_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='playlistsong',
+            name='state',
+            field=models.IntegerField(db_index=True, default=0),
+        ),
+    ]
diff --git a/marietje/queues/models.py b/marietje/queues/models.py
index 8944dfa..75bb015 100644
--- a/marietje/queues/models.py
+++ b/marietje/queues/models.py
@@ -35,7 +35,7 @@ class PlaylistSong(models.Model):
     # 1: Playing.
     # 2: Played.
     # 3: Cancelled.
-    state = models.IntegerField(default=0)
+    state = models.IntegerField(default=0, db_index=True)
 
     def move_up(self):
         other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__lt=self.id)\