diff --git a/scripts/install b/scripts/install
index 5ea13b3..750e793 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,11 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+    :
+else
+    ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # BUILD APP
diff --git a/scripts/remove b/scripts/remove
index 5cbf8c7..b67cd00 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -93,7 +93,11 @@ ynh_secure_remove --file="/var/log/$app.log"
 #=================================================
 ynh_script_progression --message="Removing swap..."
 
-ynh_del_swap
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+	:
+else
+	ynh_del_swap
+fi
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index aa44a01..a967402 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -100,7 +100,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+    :
+else
+    ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # BUILD APP
diff --git a/scripts/upgrade b/scripts/upgrade
index 63a586d..8fe393d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+    :
+else
+    ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # BUILD APP