diff --git a/include/cleanup_cli.php b/include/cleanup_cli.php
index b97a6296..9bc5d3fe 100644
--- a/include/cleanup_cli.php
+++ b/include/cleanup_cli.php
@@ -15,8 +15,13 @@ register_shutdown_function(function () use ($fd) {
     fclose($fd);
 });
 
+$force = 0;
+if (isset($_SERVER['argv'][1])) {
+    $force = $_SERVER['argv'][1] ? 1 : 0;
+}
+
 try {
-    $result = autoclean();
+    $result = autoclean($force, true);
     do_log("[CLEANUP_CLI DONE!] $result");
 } catch (\Exception $exception) {
     do_log("ERROR: " . $exception->getMessage());
diff --git a/include/functions.php b/include/functions.php
index c946751e..13d9c97f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1898,7 +1898,7 @@ function userlogin() {
     return $loginResult = true;
 }
 
-function autoclean() {
+function autoclean($forceAll = 0, $printProgress = false) {
 	global $autoclean_interval_one, $rootpath;
 	$now = TIMENOW;
 	$res = sql_query("SELECT value_u FROM avps WHERE arg = 'lastcleantime'");
@@ -1919,7 +1919,7 @@ function autoclean() {
 		return false;
 	}
 	require_once($rootpath . 'include/cleanup.php');
-	return docleanup();
+	return docleanup($forceAll, $printProgress);
 }
 
 function unesc($x) {