diff --git a/src/apps.js b/src/apps.js
index 6a623b849..4716d14ec 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -1801,6 +1801,8 @@ async function setStorage(app, volumeId, volumePrefix, auditSource) {
 
         error = validateStorage(volume, volumePrefix);
         if (error) throw error;
+    } else {
+        volumeId = volumePrefix = null;
     }
 
     const task = {
diff --git a/src/routes/apps.js b/src/routes/apps.js
index d3efc2f72..fdcbfe21f 100644
--- a/src/routes/apps.js
+++ b/src/routes/apps.js
@@ -436,7 +436,7 @@ async function setStorage(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
     assert.strictEqual(typeof req.app, 'object');
 
-    if (req.body.storageVolumeId !== null && typeof req.body.dataVolumeId !== 'string') return next(new HttpError(400, 'storageVolumeId must be a string'));
+    if (req.body.storageVolumeId !== null && typeof req.body.storageVolumeId !== 'string') return next(new HttpError(400, 'storageVolumeId must be a string'));
     if (req.body.storageVolumePrefix !== null && typeof req.body.storageVolumePrefix !== 'string') return next(new HttpError(400, 'storageVolumePrefix must be a string'));
 
     const [error, result] = await safe(apps.setStorage(req.app, req.body.storageVolumeId, req.body.storageVolumePrefix, AuditSource.fromRequest(req)));