diff --git a/gajim/gajim.py b/gajim/gajim.py
index 1e85ad1ba..fb6916c99 100644
--- a/gajim/gajim.py
+++ b/gajim/gajim.py
@@ -259,6 +259,10 @@ class GajimApplication(Gtk.Application):
         if hasattr(self.interface, 'roster') and self.interface.roster:
             self.interface.roster.prepare_quit()
 
+        # Commit any outstanding SQL transactions
+        from common import gajim
+        gajim.logger.commit()
+
     def do_handle_local_options(self, options: GLib.VariantDict) -> int:
 
         logging_helpers.init()
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 422b65378..d23491259 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -2468,9 +2468,6 @@ class RosterWindow:
             gajim.interface.hide_systray()
         self.save_done = True
 
-        # Commit any outstanding SQL transactions
-        gajim.logger.commit()
-
     def quit_gtkgui_interface(self):
         """
         When we quit the gtk interface - exit gtk