diff --git a/lib/livebook/application.ex b/lib/livebook/application.ex
index 8342cdb18..0220f31d6 100644
--- a/lib/livebook/application.ex
+++ b/lib/livebook/application.ex
@@ -7,7 +7,7 @@ defmodule Livebook.Application do
     ensure_directories!()
     set_local_file_system!()
 
-    if Application.fetch_env!(:livebook, :epmdless) do
+    if Livebook.Config.epmdless?() do
       validate_epmdless!()
       ensure_distribution!()
     else
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 0278527ed..0e26ca154 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -73,7 +73,7 @@ teams_exclude =
 
 # ELIXIR_ERL_OPTIONS="-epmd_module Elixir.Livebook.EPMD -start_epmd false -erl_epmd_port 0" LIVEBOOK_EPMDLESS=true mix test
 epmd_exclude =
-  if Application.fetch_env!(:livebook, :epmdless) do
+  if Livebook.Config.epmdless?() do
     [:with_epmd, :teams_integration]
   else
     [:without_epmd]