diff --git a/scripts/install b/scripts/install
index 819bc6f..abad49d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -107,8 +107,17 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 # ADD SWAP
 #=================================================
-ynh_script_progression --message="Adding swap..." --weight=5
+ynh_script_progression --message="Adding swap if needed..." --weight=5
 
+total_memory=$(ynh_get_ram --total)
+swap_needed=0
+
+if [ $total_memory -lt $MEMORY_NEEDED ]; then
+  # Need a minimum of 2.5Go of memory
+  swap_needed=$(($MEMORY_NEEDED - $total_memory))
+fi
+
+ynh_script_progression --message="Adding $swap_needed Mo to swap..."
 ynh_add_swap --size=$swap_needed
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 9745dd8..1f0ba8d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -153,8 +153,17 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 # ADD SWAP
 #=================================================
-ynh_script_progression --message="Adding swap..." --weight=5
+ynh_script_progression --message="Adding swap if needed..." --weight=1
 
+total_memory=$(ynh_get_ram --total)
+swap_needed=0
+
+if [ $total_memory -lt $MEMORY_NEEDED ]; then
+	# Need a minimum of 8Go of memory
+	swap_needed=$(($MEMORY_NEEDED - $total_memory))
+fi
+
+ynh_script_progression --message="Adding $swap_needed Mo to swap..."
 ynh_add_swap --size=$swap_needed
 
 #=================================================