diff --git a/src/apps.js b/src/apps.js
index 4b549c9b2..bdf499fda 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -1673,7 +1673,10 @@ async function setDevices(app, devices, auditSource) {
     assert.strictEqual(typeof auditSource, 'object');
 
     const appId = app.id;
-    const error = checkAppState(app, exports.ISTATE_PENDING_RECREATE_CONTAINER);
+    let error = checkAppState(app, exports.ISTATE_PENDING_RECREATE_CONTAINER);
+    if (error) throw error;
+
+    error = validateDevices(devices);
     if (error) throw error;
 
     const task = {