diff --git a/caravel/migrations/versions/ad82a75afd82_add_query_model.py b/caravel/migrations/versions/ad82a75afd82_add_query_model.py
index 2967283b1e446..2d5c99551b283 100644
--- a/caravel/migrations/versions/ad82a75afd82_add_query_model.py
+++ b/caravel/migrations/versions/ad82a75afd82_add_query_model.py
@@ -43,10 +43,9 @@ def upgrade():
     )
     op.add_column('dbs', sa.Column('select_as_create_table_as', sa.Boolean(),
                                    nullable=True))
-    op.create_index(op.f('ix_query_changed_on'), 'query', ['changed_on'],
-                    unique=False)
     op.create_index(
-        op.f('ix_query_user_id'), 'query', ['user_id'], unique=False)
+        op.f('ti_user_id_changed_on'),
+        'query', ['user_id', 'changed_on'], unique=False)
 
 
 def downgrade():
diff --git a/caravel/models.py b/caravel/models.py
index 3ad03358f8813..d23c506aefb4f 100644
--- a/caravel/models.py
+++ b/caravel/models.py
@@ -1769,7 +1769,7 @@ class Query(Model):
     # Store the tmp table into the DB only if the user asks for it.
     tmp_table_name = Column(String(256))
     user_id = Column(
-        Integer, ForeignKey('ab_user.id'), nullable=True, index=True)
+        Integer, ForeignKey('ab_user.id'), nullable=True)
 
     # models.QueryStatus
     status = Column(String(16))
@@ -1796,8 +1796,11 @@ class Query(Model):
     start_time = Column(DateTime)
     end_time = Column(DateTime)
     changed_on = Column(
-        DateTime, default=datetime.now, onupdate=datetime.now, nullable=True,
-        index=True)
+        DateTime, default=datetime.now, onupdate=datetime.now, nullable=True)
+
+    __table_args__ = (
+        sqla.Index('ti_user_id_changed_on', user_id, changed_on),
+    )
 
     def to_dict(self):
         return {