diff --git a/src/device-api/common.js b/src/device-api/common.js
index c3824b7e..6411f60c 100644
--- a/src/device-api/common.js
+++ b/src/device-api/common.js
@@ -135,7 +135,7 @@ export function safeAppClone(app) {
 	const containerIdForService = _.fromPairs(
 		_.map(app.services, (svc) => [
 			svc.serviceName,
-			svc.containerId.substr(0, 12),
+			svc.containerId != null ? svc.containerId.substr(0, 12) : '',
 		]),
 	);
 	return {