diff --git a/app/controllers/registrar/account_activities_controller.rb b/app/controllers/registrar/account_activities_controller.rb
index 7225b630b..2b3fc7951 100644
--- a/app/controllers/registrar/account_activities_controller.rb
+++ b/app/controllers/registrar/account_activities_controller.rb
@@ -1,7 +1,7 @@
 class Registrar::AccountActivitiesController < RegistrarController
   load_and_authorize_resource
 
-  def index
+  def index # rubocop: disable Metrics/AbcSize
     params[:q] ||= {}
     account = current_user.registrar.cash_account
 
@@ -9,14 +9,18 @@ class Registrar::AccountActivitiesController < RegistrarController
     begin
       end_time = params[:q][:created_at_lteq].try(:to_date)
       params[:q][:created_at_lteq] = end_time.try(:end_of_day)
-    rescue; end
+    rescue
+      logger.warn('Invalid date')
+    end
 
     @q = account.activities.includes(:invoice).search(params[:q])
     @q.sorts = 'id desc' if @q.sorts.empty?
 
     respond_to do |format|
       format.html { @account_activities = @q.result.page(params[:page]) }
-      format.csv { send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv" }
+      format.csv do
+        send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
+      end
     end
 
     params[:q][:created_at_lteq] = ca_cache
diff --git a/app/models/account_activity.rb b/app/models/account_activity.rb
index 459b240bc..9092563c0 100644
--- a/app/models/account_activity.rb
+++ b/app/models/account_activity.rb
@@ -25,8 +25,8 @@ class AccountActivity < ActiveRecord::Base
       CSV.generate(headers: true) do |csv|
         csv << %w(description activity_type receipt_date sum)
 
-        all.each do |x|
-          csv << attributes.map{ |attr| x.send(attr) }
+        all.find_each do |x|
+          csv << attributes.map { |attr| x.send(attr) }
         end
       end
     end