diff --git a/package.json b/package.json
index 41b761679..dfc99ee90 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,6 @@
     "fast-clone": "^1.5.13",
     "hyperdeck-connection": "^0.4.3",
     "osc": "^2.4.0",
-    "p-all": "^3.0.0",
     "p-queue": "^6.4.0",
     "p-timeout": "^3.2.0",
     "request": "^2.88.0",
diff --git a/src/conductor.ts b/src/conductor.ts
index 2b5d66494..c111cf08b 100644
--- a/src/conductor.ts
+++ b/src/conductor.ts
@@ -34,7 +34,6 @@ import { SisyfosMessageDevice, DeviceOptionsSisyfosInternal } from './devices/si
 import { SingularLiveDevice, DeviceOptionsSingularLiveInternal } from './devices/singularLive'
 import { VizMSEDevice, DeviceOptionsVizMSEInternal } from './devices/vizMSE'
 import PQueue from 'p-queue'
-import * as PAll from 'p-all'
 import PTimeout from 'p-timeout'
 export { DeviceContainer }
 export { CommandWithContext }
@@ -546,9 +545,7 @@ export class Conductor extends EventEmitter {
 	}
 
 	private _mapAllDevices<T> (fcn: (d: DeviceContainer) => Promise<T>): Promise<T[]> {
-		return PAll(_.map(_.values(this.devices), d => () => fcn(d)), {
-			stopOnError: false
-		})
+		return Promise.all(_.map(_.values(this.devices), d => fcn(d)))
 	}
 
 	/**
diff --git a/yarn.lock b/yarn.lock
index c8e24598e..2581ab3a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4487,13 +4487,6 @@ osc@^2.4.0:
   optionalDependencies:
     serialport "8.0.6"
 
-p-all@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-all/-/p-all-3.0.0.tgz#077c023c37e75e760193badab2bad3ccd5782bfb"
-  integrity sha512-qUZbvbBFVXm6uJ7U/WDiO0fv6waBMbjlCm4E66oZdRR+egswICarIdHyVSZZHudH8T5SF8x/JG0q0duFzPnlBw==
-  dependencies:
-    p-map "^4.0.0"
-
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -4553,13 +4546,6 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-queue@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.4.0.tgz#5050b379393ea1814d6f9613a654f687d92c0466"