diff --git a/plexpy/macos.py b/plexpy/macos.py
index 9c5505fd..4dafaa13 100644
--- a/plexpy/macos.py
+++ b/plexpy/macos.py
@@ -162,10 +162,11 @@ def set_startup():
         plist_file_path = os.path.join(launch_agents, plist_file)
 
         exe = sys.executable
+        run_args = [arg for arg in plexpy.ARGS if arg != '--nolaunch']
         if plexpy.FROZEN:
-            args = [exe]
+            args = [exe] + run_args
         else:
-            args = [exe, plexpy.FULL_PATH]
+            args = [exe, plexpy.FULL_PATH] + run_args
 
         plist_dict = {
             'Label': common.PRODUCT,
diff --git a/plexpy/windows.py b/plexpy/windows.py
index c04600a3..35adc2ff 100644
--- a/plexpy/windows.py
+++ b/plexpy/windows.py
@@ -148,10 +148,11 @@ def set_startup():
     startup_reg_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
 
     exe = sys.executable
+    run_args = [arg for arg in plexpy.ARGS if arg != '--nolaunch']
     if plexpy.FROZEN:
-        args = [exe]
+        args = [exe] + run_args
     else:
-        args = [exe, plexpy.FULL_PATH]
+        args = [exe, plexpy.FULL_PATH] + run_args
 
     registry_key_name = '{}_{}'.format(common.PRODUCT, plexpy.CONFIG.PMS_UUID)