diff --git a/data/versioned/24.04/post_setup.sh b/data/versioned/24.04/post_setup.sh
index 03eeb60..7ff8be4 100644
--- a/data/versioned/24.04/post_setup.sh
+++ b/data/versioned/24.04/post_setup.sh
@@ -29,8 +29,7 @@ function setup_snap() {
   if command -v snap &>/dev/null; then
     log 'info' "Purging 'snapd'"
 
-    killall snap
-    systemctl stop snapd
+    killall snap &>/dev/null || :
 
     until [[ $(snap list 2>&1 || :) == 'No snaps'*'installed'* ]]; do
       while read -r SNAP _; do
@@ -38,6 +37,7 @@ function setup_snap() {
       done < <(snap list |& tail -n +2 || :)
     done
 
+    systemctl stop snapd.service snapd.socket
     apt-get -qq purge snapd gnome-software-plugin-snap
     apt-mark -qq hold snapd
     rm -rf /var/cache/snapd/ "${HOME}/snapd" "${HOME}/snap"