diff --git a/addons/map/CfgVehicles.hpp b/addons/map/CfgVehicles.hpp
index d1b7e38dba..30cae96ef6 100644
--- a/addons/map/CfgVehicles.hpp
+++ b/addons/map/CfgVehicles.hpp
@@ -39,14 +39,13 @@ class CfgVehicles {
         };
     };
 
-    class Module_F;
-    class ACE_ModuleBlueForceTracking: Module_F {
+    class ACE_ModuleBlueForceTracking: ACE_Module {
         author = ECSTRING(common,ACETeam);
         category = "ACE";
         displayName = CSTRING(BFT_Module_DisplayName);
         function = QFUNC(blueForceTrackingModule);
         scope = 2;
-        isGlobal = 1;
+        isGlobal = 0;
         icon = PATHTOF(UI\Icon_Module_BFTracking_ca.paa);
         class Arguments {
             class Enabled {
diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 52c904b1ce..95f42db431 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -47,6 +47,7 @@ call FUNC(determineZoom);
 ["SettingsInitialized", {
     // Start Blue Force Tracking if Enabled
     if (GVAR(BFT_Enabled)) then {
+        diag_log text "[ACE] Blue Force Tracking Enabled (client)";
         GVAR(BFT_markers) = [];
         [FUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler;
     };
diff --git a/addons/map/functions/fnc_blueForceTrackingModule.sqf b/addons/map/functions/fnc_blueForceTrackingModule.sqf
index bab776c9ab..33049c38ca 100644
--- a/addons/map/functions/fnc_blueForceTrackingModule.sqf
+++ b/addons/map/functions/fnc_blueForceTrackingModule.sqf
@@ -12,15 +12,12 @@
 
 #include "script_component.hpp"
 
-if !(hasInterface) exitWith {};
+if (!isServer) exitWith {};
 
-PARAMS_3(_logic,_units,_activated);
-
-if !(_activated) exitWith {};
+PARAMS_1(_logic);
 
 [_logic, QGVAR(BFT_Enabled), "Enabled"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(BFT_Interval), "Interval"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule);
 
-diag_log text "[ACE]: Blue Force Tracking Module initialized.";
-TRACE_2("[ACE]: Blue Force Tracking Module initialized.", GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));
+diag_log text "[ACE]: Blue Force Tracking Module initialized. (server)";