diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index dc9b79de66..dc12518479 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -895,16 +895,20 @@ bool SyncJournalDb::updateMetadataTableStructure()
         const auto quotaBytesAvailable =  QStringLiteral("quotaBytesAvailable");
         const auto defaultCommand = QStringLiteral("DEFAULT -1 NOT NULL");
         const auto bigInt = QStringLiteral("BIGINT");
+        auto result = false;
 
         if (columnExists(quotaBytesUsed) && !hasDefaultValue(quotaBytesUsed)) {
-            re = removeColumn(quotaBytesUsed);
+            result = removeColumn(quotaBytesUsed);
         }
 
         if (columnExists(quotaBytesAvailable) && !hasDefaultValue(quotaBytesAvailable)) {
-            re = removeColumn(quotaBytesAvailable);
+            result = removeColumn(quotaBytesAvailable);
+        }
+
+        if (result) {
+            columns = tableColumns("metadata");
         }
 
-        columns = tableColumns("metadata");
         addColumn(quotaBytesUsed, bigInt, false, defaultCommand);
         addColumn(quotaBytesAvailable, bigInt, false, defaultCommand);
     }