diff --git a/db/migrate/20170414005856_add_unique_name_constraint_to_users.rb b/db/migrate/20170414005856_add_unique_name_constraint_to_users.rb
index e862805a4..3bf8d608f 100644
--- a/db/migrate/20170414005856_add_unique_name_constraint_to_users.rb
+++ b/db/migrate/20170414005856_add_unique_name_constraint_to_users.rb
@@ -1,6 +1,8 @@
 class AddUniqueNameConstraintToUsers < ActiveRecord::Migration
   def up
-  	remove_index :users, :name
-  	execute "create unique index index_users_on_name on users(lower(name))"
+  	ActiveRecord::Base.without_timeout do
+	  	remove_index :users, :name
+  		execute "create unique index index_users_on_name on users(lower(name))"
+  	end
   end
 end