diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp
index 9fb5634f9..543943f08 100644
--- a/companion/src/firmwares/generalsettings.cpp
+++ b/companion/src/firmwares/generalsettings.cpp
@@ -235,6 +235,8 @@ void GeneralSettings::init()
   hatsMode = HATSMODE_SWITCHABLE;
   inactivityTimer = 10;
   internalModule = g.profile[g.sessionId()].defaultInternalModule();
+  stickMode = g.profile[g.sessionId()].defaultMode();
+  templateSetup = g.profile[g.sessionId()].channelOrder();
 
   QString lang = getCurrentFirmware()->getLanguage();
   if (lang.size() > 1) {