diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 57e777c6e..9889f074d 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -245,7 +245,9 @@ void setupModules()
 #if ARCH_PORTDUINO
     new HostMetricsModule();
 #if SFPP_ENABLED
-    new StoreForwardPlusPlusModule();
+    if (portduino_config.sfpp_enabled) {
+        new StoreForwardPlusPlusModule();
+    }
 #endif
 #endif
 #if HAS_TELEMETRY