diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e575fd583b..54727dfcda 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7381,6 +7381,8 @@ class upgradeModel extends model
             ->where('createdDate')->eq('0000-00-00 00:00:00')
             ->fetchPairs('gid');
 
+        if(empty($chats)) return true;
+
         $createdDateData = array();
 
         /* Try query earliest message date indexed. */
@@ -7427,6 +7429,8 @@ class upgradeModel extends model
         $queryData = array();
         foreach($knownMinDates as $gid => $date) $queryData[] = "WHEN {$chats[$gid]} THEN '{$date}'";
 
+        if(empty($queryData)) return true;
+
         $query = "UPDATE " . TABLE_IM_CHAT . " SET `createdDate` = (CASE `id` " . join(' ', $queryData) . " END) WHERE `id` IN(" . join(",", array_values($chats)) . ");";
         $this->dao->query($query);
 
@@ -7451,6 +7455,8 @@ class upgradeModel extends model
             ->orderBy('id_asc')
             ->fetchAll();
 
+        if(empty($chatTableData)) return true;
+
         /* Sort ranges by table. */
         $tableRanges = array();
         foreach($chatTableData as $chatTable)