diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index cd47b70e1a55..2d28f530f61f 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -1267,14 +1267,14 @@ BrowserGlue.prototype = {
             let { BackgroundUpdate } = ChromeUtils.importESModule(
               "resource://gre/modules/BackgroundUpdate.sys.mjs"
             );
-            try {
-              await BackgroundUpdate.scheduleFirefoxMessagingSystemTargetingSnapshotting();
-            } catch (e) {
-              console.error(
-                "There was an error scheduling Firefox Messaging System targeting snapshotting: ",
-                e
-              );
-            }
+            // try {
+            //   await BackgroundUpdate.scheduleFirefoxMessagingSystemTargetingSnapshotting();
+            // } catch (e) {
+            //   console.error(
+            //     "There was an error scheduling Firefox Messaging System targeting snapshotting: ",
+            //     e
+            //   );
+            // }
             await BackgroundUpdate.maybeScheduleBackgroundUpdateTask();
           }
         },
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index 6017810c873f..2714efa3aea7 100755
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -7,6 +7,7 @@
 import glob
 import json
 import os
+import socket
 import subprocess
 import sys
 
@@ -18,7 +19,12 @@ from mozprofile import FirefoxProfile, Preferences
 from mozprofile.permissions import ServerLocations
 from mozrunner import CLI, FirefoxRunner
 
-PORT = 8888
+def find_free_port():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.bind(('', 0))
+        return s.getsockname()[1]
+
+PORT = find_free_port()
 
 PATH_MAPPINGS = {
     "/webkit/PerformanceTests": "third_party/webkit/PerformanceTests",