diff --git a/src/freedombone-template b/src/freedombone-template
index 95364def..8d06a922 100755
--- a/src/freedombone-template
+++ b/src/freedombone-template
@@ -579,14 +579,6 @@ echo '    fi'
 echo '}'
 echo ''
 echo "function remove_${app_name} {"
-if [ "$app_nodeapp" ]; then
-    echo "    npm uninstall -g ${app_nodeapp}"
-    echo ''
-fi
-if [[ "$app_node" == 'yes' ]]; then
-    echo "    remove_nodejs ${app_name}"
-    echo ''
-fi
 echo "    nginx_dissite \"\$${app_name_upper}_DOMAIN_NAME\""
 echo "    remove_certs \"\$${app_name_upper}_DOMAIN_NAME\""
 echo ''
@@ -598,6 +590,14 @@ if [ $app_daemon ]; then
     echo '    fi'
     echo "    userdel -r ${app_name}"
 fi
+if [ "$app_nodeapp" ]; then
+    echo "    npm uninstall -g ${app_nodeapp}"
+    echo ''
+fi
+if [[ "$app_node" == 'yes' ]]; then
+    echo "    remove_nodejs ${app_name}"
+    echo ''
+fi
 if [ $app_webui ]; then
     echo ''
     echo "    if [ -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME\" ]; then"