diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb
index f833b4894..f1b641aa0 100644
--- a/app/models/epp_session.rb
+++ b/app/models/epp_session.rb
@@ -4,7 +4,7 @@ class EppSession < ApplicationRecord
   validates :session_id, uniqueness: true, presence: true
 
   class_attribute :timeout
-  self.timeout = ENV['epp_session_timeout_seconds'].to_i.seconds
+  self.timeout = (ENV['epp_session_timeout_seconds'] || 300).to_i.seconds
 
   alias_attribute :last_access, :updated_at
 
diff --git a/test/tasks/epp/clear_expired_sessions_test.rb b/test/tasks/epp/clear_expired_sessions_test.rb
index a839afb9a..c7bebcd97 100644
--- a/test/tasks/epp/clear_expired_sessions_test.rb
+++ b/test/tasks/epp/clear_expired_sessions_test.rb
@@ -10,14 +10,15 @@ class EppClearExpiredSessionsTaskTest < ActiveSupport::TestCase
   end
 
   def test_clears_expired_epp_sessions
-    timeout = 0.second
-    EppSession.timeout = timeout
+    timeout = EppSession.timeout
     session = epp_sessions(:api_bestnames)
+    next_session = epp_sessions(:api_goodnames)
     session.update!(updated_at: Time.zone.now - timeout - 1.second)
 
     run_task
 
     assert_nil EppSession.find_by(session_id: session.session_id)
+    assert EppSession.find_by(session_id: next_session.session_id)
   end
 
   private