diff --git a/app/models/directo.rb b/app/models/directo.rb
index 99a0d9265..e311641e6 100644
--- a/app/models/directo.rb
+++ b/app/models/directo.rb
@@ -67,7 +67,7 @@ class Directo < ApplicationRecord
 
 
   def self.send_monthly_invoices(debug: false)
-    I18n.locale    = :et
+    I18n.locale    = :et unless Rails.env.test?
     month          = Time.now - 1.month
     invoices_until = month.end_of_month
     date_format    = "%Y-%m-%d"
@@ -76,8 +76,9 @@ class Directo < ApplicationRecord
     min_directo    = Setting.directo_monthly_number_min.presence.try(:to_i)
     max_directo    = Setting.directo_monthly_number_max.presence.try(:to_i)
     last_directo   = [Setting.directo_monthly_number_last.presence.try(:to_i), min_directo].compact.max || 0
-    if max_directo && max_directo <= last_directo
-      raise "Directo counter is out of period (max allowed number is smaller than last counter number)"
+    if max_directo && (max_directo <= last_directo + Registrar.count)
+      raise 'Directo counter is out of period (max allowed number is smaller than last counter'\
+            'number plus Registrar\'s count)'
     end
 
     directo_next = last_directo
diff --git a/test/models/directo_test.rb b/test/models/directo_test.rb
index b1c461eb0..086ce567b 100644
--- a/test/models/directo_test.rb
+++ b/test/models/directo_test.rb
@@ -5,6 +5,19 @@ class DirectoTest < ActiveSupport::TestCase
     @invoice = invoices(:one)
   end
 
+  def test_monthly_invoices_max_range_raises_if_overlaps
+
+    Setting.directo_monthly_number_max = Setting.directo_monthly_number_last.to_i + Registrar.count - 1
+    error_message = 'Directo counter is out of period (max allowed number is smaller than last '\
+                    'counternumber plus Registrar\'s count)'
+
+    error = assert_raises RuntimeError do
+      Directo.send_monthly_invoices
+    end
+
+    assert_equal error_message, error.message
+  end
+
   def test_xml_is_include_transaction_date
     @invoice.update(total: @invoice.account_activity.bank_transaction.sum)
     @invoice.account_activity.bank_transaction.update(paid_at: Time.zone.now)