diff --git a/ChangeLog b/ChangeLog
index b0e006ccb..d3fb09c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ Bug fixes:
 - #6771 Added Ubuntu 16 to CI/CD
 - #6804 Synergy loses edition when creating a System scope config
 - #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
-
+- #6814 The system asks to save twice. 
 
 Enhancements:
 - #6750 Integrate SonarCloud for static analysis and test coverage
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 0b4b3b531..ec2533d15 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -224,8 +224,6 @@ MainWindow::~MainWindow()
     delete m_pZeroconf;
 #endif
 
-    saveSettings();
-
     delete m_pSslCertificate;
 }
 
@@ -1426,9 +1424,3 @@ void MainWindow::windowStateChanged()
     if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
         hide();
 }
-
-void MainWindow::closeEvent(QCloseEvent *event) {
-    //If the main window is closing, trigger a save
-    GUI::Config::ConfigWriter::make()->globalSave();
-    event->accept();
-}
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index c68dfb685..639e117ef 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -188,7 +188,6 @@ public slots:
         void stopDesktop();
         void changeEvent(QEvent* event);
         void retranslateMenuBar();
-        void closeEvent(QCloseEvent *event) override;
 
 #if defined(Q_OS_WIN)
         bool isServiceRunning(QString name);