diff --git a/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php b/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
index b6e117fe0e4..6d9a6328712 100644
--- a/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
+++ b/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
@@ -106,7 +106,13 @@ private function _settingsAsJSON() {
 					$this->_toJSON($row, $tableName, ['plugin_name', 'context_id', 'setting_name'], 'setting_value');
 				});
 			} else {
-				Capsule::table($tableName)->where('setting_type', 'object')->get()->each(function ($row) use ($tableName) {
+				try {
+					$settings = Capsule::table($tableName, 's')->where('setting_type', 'object')->get(['setting_name', 'setting_value', 's.*']);
+				} catch (Exception $e) {
+					error_log("Failed to migrate the settings entity \"{$tableName}\"\n" . $e);
+					continue;
+				}
+				$settings->each(function ($row) use ($tableName) {
 					$this->_toJSON($row, $tableName, ['setting_name', 'locale'], 'setting_value');
 				});
 			}