diff --git a/src/config/config.lua b/src/config/config.lua
index bd857a3eb756f2a36b064c15e4106650fe36c98b..778463acece29c515e8b9863d8b502a4ef0681e4 100644
--- a/src/config/config.lua
+++ b/src/config/config.lua
@@ -63,15 +63,4 @@ function enable_access()
   load_access("portal")
 end
 
-function enable_audio()
-  -- Enables functionality to save and restore default device profiles
-  load_module("default-profile")
-
-  -- Enables saving and restoring certain metadata such as default endpoints
-  load_module("default-metadata")
-
-  -- Implements storing metadata about objects in RAM
-  load_module("metadata")
-end
-
 enable_access()
diff --git a/src/config/config.lua.d/90-enable-audio-all.lua b/src/config/config.lua.d/90-enable-audio-all.lua
index b851040aa1d52eba3b5ceee823433aebe9d9be09..212d08213d3c1627a40725767ba2515d7a9b1fed 100644
--- a/src/config/config.lua.d/90-enable-audio-all.lua
+++ b/src/config/config.lua.d/90-enable-audio-all.lua
@@ -1,3 +1,12 @@
-enable_audio()
+-- Enable local & bluetooth audio devices
 alsa_monitor.enable()
 bluez_monitor.enable()
+
+-- Enables functionality to save and restore default device profiles
+load_module("default-profile")
+
+-- Enables saving and restoring certain metadata such as default endpoints
+load_module("default-metadata")
+
+-- Implements storing metadata about objects in RAM
+load_module("metadata")