diff --git a/web/server/codechecker_server/database/run_db_model.py b/web/server/codechecker_server/database/run_db_model.py
index 702dbb246c..394ac311bc 100644
--- a/web/server/codechecker_server/database/run_db_model.py
+++ b/web/server/codechecker_server/database/run_db_model.py
@@ -134,7 +134,8 @@ def __init__(self, run_history_id, analyzer_type, version, successful,
         ForeignKey('run_histories.id',
                    deferrable=True,
                    initially="DEFERRED",
-                   ondelete="CASCADE")),
+                   ondelete="CASCADE"),
+        index=True),
     Column('analysis_info_id', Integer, ForeignKey('analysis_info.id'))
 )
 
@@ -314,7 +315,8 @@ def __init__(self, line_begin, col_begin, line_end, col_end,
         ForeignKey('reports.id',
                    deferrable=True,
                    initially="DEFERRED",
-                   ondelete="CASCADE")),
+                   ondelete="CASCADE"),
+        index=True),
     Column('analysis_info_id', Integer, ForeignKey('analysis_info.id'))
 )
 
diff --git a/web/server/codechecker_server/migrations/report/versions/a24461972d2e_add_index_for_report_and_history_id_columns.py b/web/server/codechecker_server/migrations/report/versions/a24461972d2e_add_index_for_report_and_history_id_columns.py
new file mode 100644
index 0000000000..6b72e10318
--- /dev/null
+++ b/web/server/codechecker_server/migrations/report/versions/a24461972d2e_add_index_for_report_and_history_id_columns.py
@@ -0,0 +1,39 @@
+"""Add index for report and history id columns
+
+Revision ID: a24461972d2e
+Revises: dabc6998b8f0
+Create Date: 2021-06-10 15:38:59.504534
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'a24461972d2e'
+down_revision = 'dabc6998b8f0'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+
+
+def upgrade():
+    op.create_index(
+        op.f('ix_report_analysis_info_report_id'),
+        'report_analysis_info',
+        ['report_id'],
+        unique=False)
+
+    op.create_index(
+        op.f('ix_run_history_analysis_info_run_history_id'),
+        'run_history_analysis_info',
+        ['run_history_id'],
+        unique=False)
+
+
+def downgrade():
+    op.drop_index(
+        op.f('ix_run_history_analysis_info_run_history_id'),
+        table_name='run_history_analysis_info')
+
+    op.drop_index(
+        op.f('ix_report_analysis_info_report_id'),
+        table_name='report_analysis_info')