diff --git a/src/common/ownsql.h b/src/common/ownsql.h
index 9b395d40486..7ca0090fd42 100644
--- a/src/common/ownsql.h
+++ b/src/common/ownsql.h
@@ -156,10 +156,10 @@ class OCSYNC_EXPORT SqlQuery
     const QByteArray &lastQuery() const;
     int numRowsAffected();
     void reset_and_clear_bindings();
-    void finish();
 
 private:
     void bindValueInternal(int pos, const QVariant &value);
+    void finish();
 
     SqlDatabase *_sqldb = nullptr;
     sqlite3 *_db = nullptr;
@@ -167,6 +167,8 @@ class OCSYNC_EXPORT SqlQuery
     QString _error;
     int _errId;
     QByteArray _sql;
+
+    friend class SqlDatabase;
 };
 
 } // namespace OCC
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 7d6950c79da..60968b41ff0 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -407,10 +407,7 @@ bool SyncJournalDb::checkConnect()
             && createQuery.errorId() == SQLITE_IOERR
             && sqlite3_extended_errcode(_db.sqliteDb()) == SQLITE_IOERR_SHMMAP) {
             qCWarning(lcDb) << "IO error SHMMAP on table creation, attempting with DELETE journal mode";
-
             _journalMode = "DELETE";
-            createQuery.finish();
-            pragma1.finish();
             commitTransaction();
             _db.close();
             return checkConnect();
@@ -1720,8 +1717,6 @@ QVector<SyncJournalDb::PollInfo> SyncJournalDb::getPollInfos()
         info._url = query.stringValue(3);
         res.append(info);
     }
-
-    query.finish();
     return res;
 }