diff --git a/snapcraft.yaml b/snapcraft.yaml
index 5768def1e..12d4867fc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1436,6 +1436,8 @@ parts:
       git config user.email "noreply@lists.canonical.com"
       git config user.name "LXD snap builder"
 
+      git cherry-pick -x db6b22f7f9008a3ee66892f9a13fb17acd783d5a # lxd/instance/drivers/driver/common: Fix crash when device doesn't return run config when being live updated
+
       # Setup build environment
       export GOPATH="$(realpath ./.go)"
       export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/"