diff --git a/core/Command/Db/ConvertFilecacheBigInt.php b/core/Command/Db/ConvertFilecacheBigInt.php
index da3e60fbb5ec5f4b5d535cb6819b7692c9cd63a8..75d3a48a5c8c4f9fd0093cdd2d94d2742adeacd2 100644
--- a/core/Command/Db/ConvertFilecacheBigInt.php
+++ b/core/Command/Db/ConvertFilecacheBigInt.php
@@ -52,6 +52,8 @@ class ConvertFilecacheBigInt extends Command {
 
 	protected function getColumnsByTable() {
 		return [
+			'activity' => ['activity_id', 'object_id'],
+			'activity_mq' => ['mail_id'],
 			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
 			'mimetypes' => ['id'],
 			'storages' => ['numeric_id'],
@@ -65,6 +67,10 @@ class ConvertFilecacheBigInt extends Command {
 
 		$tables = $this->getColumnsByTable();
 		foreach ($tables as $tableName => $columns) {
+			if (!$schema->hasTable($tableName)) {
+				continue;
+			}
+
 			$table = $schema->getTable($tableName);
 
 			foreach ($columns as $columnName) {