diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py
index ff8bfdc5aee06a886577b234276cb014fe7b4968..75b6e29a2d34e652137c06dcef722150990aa6fa 100644
--- a/transfer_service/db_connector.py
+++ b/transfer_service/db_connector.py
@@ -395,19 +395,19 @@ class DbConnector(object):
                        creation_time,
                        start_time,
                        owner_id
-                       FROM job
-                       WHERE phase NOT IN ('ABORTED',
-                                           'ARCHIVED',
-                                           'COMPLETED',
-                                           'ERROR')
-                       AND
-                       job_type IN ('pullFromVoSpace',
-                                    'pullToVoSpace',
-                                    'pushToVoSpace',
-                                    'vos_data',
-                                    'vos_group',
-                                    'vos_import')
-                       ORDER BY creation_time DESC;
+                FROM job
+                WHERE phase NOT IN ('ABORTED',
+                                    'ARCHIVED',
+                                    'COMPLETED',
+                                    'ERROR')
+                AND job_type IN ('pullFromVoSpace',
+                                 'pullToVoSpace',
+                                 'pushToVoSpace',
+                                 'vos_data',
+                                 'vos_group',
+                                 'vos_import')
+                ORDER BY creation_time DESC
+                LIMIT 30;
                 """)
             result = cursor.fetchall()
             cursor.close()
@@ -438,16 +438,16 @@ class DbConnector(object):
                            creation_time,
                            start_time,
                            owner_id
-                           FROM job
-                           WHERE phase = %s
-                           AND
-                           job_type IN ('pullFromVoSpace',
-                                        'pullToVoSpace',
-                                        'pushToVoSpace',
-                                        'vos_data',
-                                        'vos_group',
-                                        'vos_import')
-                           ORDER BY creation_time DESC;
+                    FROM job
+                    WHERE phase = %s
+                    AND job_type IN ('pullFromVoSpace',
+                                     'pullToVoSpace',
+                                     'pushToVoSpace',
+                                     'vos_data',
+                                     'vos_group',
+                                     'vos_import')
+                    ORDER BY creation_time DESC
+                    LIMIT 30;
                     """,
                     (phase,))
             else:
@@ -459,15 +459,15 @@ class DbConnector(object):
                            end_time,
                            owner_id
                            FROM job
-                           WHERE phase = %s
-                           AND
-                           job_type IN ('pullFromVoSpace',
-                                        'pullToVoSpace',
-                                        'pushToVoSpace',
-                                        'vos_data',
-                                        'vos_group',
-                                        'vos_import')
-                           ORDER BY creation_time DESC;
+                    WHERE phase = %s
+                    AND job_type IN ('pullFromVoSpace',
+                                     'pullToVoSpace',
+                                     'pushToVoSpace',
+                                     'vos_data',
+                                     'vos_group',
+                                     'vos_import')
+                    ORDER BY creation_time DESC
+                    LIMIT 30;
                     """,
                     (phase,))
             result = cursor.fetchall()