diff --git a/src/apps/api/serializers/queues.py b/src/apps/api/serializers/queues.py
index 3614b61a2..b3d84aee6 100644
--- a/src/apps/api/serializers/queues.py
+++ b/src/apps/api/serializers/queues.py
@@ -61,7 +61,6 @@ class QueueSerializer(QueueOwnerMixin, serializers.ModelSerializer):
     is_owner = serializers.SerializerMethodField()
     owner = serializers.CharField(source='owner.username', read_only=True)
     organizers = OrganizerSerializer(many=True, read_only=True)
-    competitions = serializers.SerializerMethodField()
 
     class Meta:
         model = Queue
@@ -75,7 +74,6 @@ class Meta:
             'created_when',
             'is_owner',
             'id',
-            'competitions',
         )
         # This serializer is read only, basically..
         read_only_fields = (
@@ -87,9 +85,15 @@ class Meta:
             'broker_url',
             'created_when',
             'is_owner',
-            'competitions',
         )
 
+
+class QueueListSerializer(QueueSerializer):
+    competitions = serializers.SerializerMethodField()
+
+    class Meta(QueueSerializer.Meta):
+        fields = QueueSerializer.Meta.fields + ('competitions',)
+
     def get_competitions(self, obj):
         # get user from the context request
         user = self.context['request'].user
diff --git a/src/apps/api/views/queues.py b/src/apps/api/views/queues.py
index db96188c6..23e486e85 100644
--- a/src/apps/api/views/queues.py
+++ b/src/apps/api/views/queues.py
@@ -13,7 +13,7 @@
 
 class QueueViewSet(ModelViewSet):
     queryset = Queue.objects.all()
-    serializer_class = serializers.QueueSerializer
+    serializer_class = serializers.QueueListSerializer
     filter_fields = ('owner', 'is_public', 'name')
     filter_backends = (DjangoFilterBackend, SearchFilter)
     search_fields = ('name',)
@@ -29,7 +29,7 @@ def get_queryset(self):
 
     def get_serializer_class(self):
         if self.request.method == 'GET':
-            return serializers.QueueSerializer
+            return serializers.QueueListSerializer
         else:
             return serializers.QueueCreationSerializer