diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 415adadd61..4d3ff16f99 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -114,9 +114,9 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
             ServerInterface::createFromDictionary(interfaceDictionary);
 
 
-        if (global::windowDelegate->isMaster()) {
+        //if (global::windowDelegate->isMaster()) {
             serverInterface->initialize();
-        }
+        //}
 
         _interfaceOwner.addPropertySubOwner(serverInterface.get());
 
@@ -132,9 +132,9 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
 }
 
 void ServerModule::preSync() {
-    if (!global::windowDelegate->isMaster()) {
-        return;
-    }
+    //if (!global::windowDelegate->isMaster()) {
+    //    return;
+    //}
 
     // Set up new connections.
     for (std::unique_ptr<ServerInterface>& serverInterface : _interfaces) {
@@ -204,9 +204,9 @@ void ServerModule::disconnectAll() {
     ZoneScoped
 
     for (std::unique_ptr<ServerInterface>& serverInterface : _interfaces) {
-        if (global::windowDelegate->isMaster()) {
+        //if (global::windowDelegate->isMaster()) {
             serverInterface->deinitialize();
-        }
+        //}
     }
 
     for (ConnectionData& connectionData : _connections) {
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 917d42ac63..91a103dbdd 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -576,26 +576,31 @@ void ScriptEngine::writeLog(const std::string& script) {
 void ScriptEngine::preSync(bool isMaster) {
     ZoneScoped
 
-    if (!isMaster) {
-        return;
-    }
-
     std::lock_guard guard(_clientScriptsMutex);
-    while (!_incomingScripts.empty()) {
-        QueueItem item = std::move(_incomingScripts.front());
-        _incomingScripts.pop();
+    if (isMaster) {
+        while (!_incomingScripts.empty()) {
+            QueueItem item = std::move(_incomingScripts.front());
+            _incomingScripts.pop();
 
-        _scriptsToSync.push_back(item.script);
-        const bool remoteScripting = item.remoteScripting;
+            _scriptsToSync.push_back(item.script);
+            const bool remoteScripting = item.remoteScripting;
 
-        // Not really a received script but the master also needs to run the script...
-        _masterScriptQueue.push(item);
+            // Not really a received script but the master also needs to run the script...
+            _masterScriptQueue.push(item);
 
-        if (global::parallelPeer->isHost() && remoteScripting) {
-            global::parallelPeer->sendScript(item.script);
+            if (global::parallelPeer->isHost() && remoteScripting) {
+                global::parallelPeer->sendScript(item.script);
+            }
+            if (global::sessionRecording->isRecording()) {
+                global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
+            }
         }
-        if (global::sessionRecording->isRecording()) {
-            global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
+    }
+    else {
+        while (!_incomingScripts.empty()) {
+            QueueItem item = std::move(_incomingScripts.front());
+            _incomingScripts.pop();
+            _clientScriptQueue.push(item.script);
         }
     }
 }