diff --git a/include/factory.hpp b/include/factory.hpp
index 14f2033b..2d7a505a 100644
--- a/include/factory.hpp
+++ b/include/factory.hpp
@@ -63,13 +63,12 @@
 #include "modules/bluetooth.hpp"
 #include "modules/inhibitor.hpp"
 #endif
-#include "bar.hpp"
-#include "modules/custom.hpp"
-#include "modules/temperature.hpp"
-
 #ifdef HAVE_LIBJACK
 #include "modules/jack.hpp"
 #endif
+#include "bar.hpp"
+#include "modules/custom.hpp"
+#include "modules/temperature.hpp"
 
 namespace waybar {
 
diff --git a/meson_options.txt b/meson_options.txt
index 5fd1b7a7..acbcce73 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,7 @@ option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable supp
 option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
 option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
 option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support')
-option('rfkill', type: 'feature', value: 'enabled', description: 'Enable support for RFKILL')
+option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL')
 option('sndio', type: 'feature', value: 'auto', description: 'Enable support for sndio')
 option('logind', type: 'feature', value: 'auto', description: 'Enable support for logind')
 option('tests', type: 'feature', value: 'auto', description: 'Enable tests')
diff --git a/src/factory.cpp b/src/factory.cpp
index 76ff65f7..3e0c873c 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -101,11 +101,6 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const {
       return new waybar::modules::Pulseaudio(id, config_[name]);
     }
 #endif
-#ifdef HAVE_LIBJACK
-    if (ref == "jack") {
-      return new waybar::modules::JACK(id, config_[name]);
-    }
-#endif
 #ifdef HAVE_LIBMPDCLIENT
     if (ref == "mpd") {
       return new waybar::modules::MPD(id, config_[name]);
@@ -123,6 +118,11 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const {
     if (ref == "inhibitor") {
       return new waybar::modules::Inhibitor(id, bar_, config_[name]);
     }
+#endif
+#ifdef HAVE_LIBJACK
+    if (ref == "jack") {
+      return new waybar::modules::JACK(id, config_[name]);
+    }
 #endif
     if (ref == "temperature") {
       return new waybar::modules::Temperature(id, config_[name]);