diff --git a/WelsonJS.Toolkit/WelsonJS.Service/MessageReceiver.cs b/WelsonJS.Toolkit/WelsonJS.Service/MessageReceiver.cs
index ef33c4a..57b2409 100644
--- a/WelsonJS.Toolkit/WelsonJS.Service/MessageReceiver.cs
+++ b/WelsonJS.Toolkit/WelsonJS.Service/MessageReceiver.cs
@@ -68,7 +68,7 @@ namespace WelsonJS.Service
                 while (await call.ResponseStream.MoveNext())
                 {
                     var response = call.ResponseStream.Current;
-                    parent.Log($"Received: {response.Message}");
+                    parent.Log($"Message received: {response.Message}");
 
                     // dispatch to the script runtime
                     parent.DispatchServiceEvent("messageReceived", new string[] { response.Message });
diff --git a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
index f9ac891..24ea77f 100644
--- a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
+++ b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
@@ -48,6 +48,7 @@ namespace WelsonJS.Service
         private string[] args;
         private bool disabledScreenTime = false;
         private bool disabledFileMonitor = false;
+        private bool disabledMessageReceiver = false;
         private ScreenMatching screenMatcher;
         private FileEventMonitor fileEventMonitor;
         private IniFile settingsFileHandler;
@@ -78,6 +79,10 @@ namespace WelsonJS.Service
                         scriptName = entry.Value;
                         break;
 
+                    case "disable-message-receiver":
+                        disabledMessageReceiver = true;
+                        break;
+
                     case "disable-screen-time":
                         disabledScreenTime = true;
                         break;
@@ -203,16 +208,24 @@ namespace WelsonJS.Service
                 fileEventMonitor = new FileEventMonitor(this, workingDirectory);
                 fileEventMonitor.Start();
 
-                Log("Trace a Sysmon file events (If Sysinternals Sysmon installed) started.");
+                Log("File Event Monitor Started");
             }
             else
             {
-                Log("Trace a Sysmon file events (If Sysinternals Sysmon installed) is disabled");
+                Log("File Event Monitor is Disabled");
             }
 
             // Start GRPC based message receiver
-            MessageReceiver receiver = new MessageReceiver(this, workingDirectory);
-            receiver.Start();
+            if (!disabledMessageReceiver) {
+                MessageReceiver receiver = new MessageReceiver(this, workingDirectory);
+                receiver.Start();
+
+                Log("GRPC Message Receiver Started");
+            }
+            else
+            {
+                Log("GRPC Message Reciver is Disabled");
+            }
 
             // Start all the registered timers
             timers.ForEach(timer => timer?.Start());