diff --git a/ChangeLog b/ChangeLog
index e2ea66074c..ea374e4135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Bug fixes:
 - #6889 Systray Icon on Ubuntu Auto Start (take 2)
 
 Enhancements:
+- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop
 - #6909 Document CLI Arguments
 - #6916 Main Window receives screen name change
 - #6910 Don't use the word “Version” for release names because it can lead to errors during update checking.
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index 8a94fd18b6..fd13c10475 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -39,7 +39,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget* parent, ServerConfig& config, co
     m_pSpinBoxHeartbeat->setValue(serverConfig().heartbeat());
 
     m_pCheckBoxRelativeMouseMoves->setChecked(serverConfig().relativeMouseMoves());
-    m_pCheckBoxScreenSaverSync->setChecked(serverConfig().screenSaverSync());
     m_pCheckBoxWin32KeepForeground->setChecked(serverConfig().win32KeepForeground());
 
     m_pCheckBoxSwitchDelay->setChecked(serverConfig().hasSwitchDelay());
@@ -57,8 +56,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget* parent, ServerConfig& config, co
 
     m_pCheckBoxIgnoreAutoConfigClient->setChecked(serverConfig().ignoreAutoConfigClient());
 
-    m_pCheckBoxEnableDragAndDrop->setChecked(serverConfig().enableDragAndDrop());
-
     m_pCheckBoxEnableClipboard->setChecked(serverConfig().clipboardSharing());
 	int clipboardSharingSizeM = static_cast<int>(serverConfig().clipboardSharingSize() / 1024);
     m_pSpinBoxClipboardSizeLimit->setValue(clipboardSharingSizeM);
@@ -90,7 +87,6 @@ void ServerConfigDialog::accept()
     serverConfig().setHeartbeat(m_pSpinBoxHeartbeat->value());
 
     serverConfig().setRelativeMouseMoves(m_pCheckBoxRelativeMouseMoves->isChecked());
-    serverConfig().setScreenSaverSync(m_pCheckBoxScreenSaverSync->isChecked());
     serverConfig().setWin32KeepForeground(m_pCheckBoxWin32KeepForeground->isChecked());
 
     serverConfig().haveSwitchDelay(m_pCheckBoxSwitchDelay->isChecked());
@@ -105,7 +101,6 @@ void ServerConfigDialog::accept()
     serverConfig().setSwitchCorner(BaseConfig::BottomRight, m_pCheckBoxCornerBottomRight->isChecked());
     serverConfig().setSwitchCornerSize(m_pSpinBoxSwitchCornerSize->value());
     serverConfig().setIgnoreAutoConfigClient(m_pCheckBoxIgnoreAutoConfigClient->isChecked());
-    serverConfig().setEnableDragAndDrop(m_pCheckBoxEnableDragAndDrop->isChecked());
     serverConfig().setDisableLockToScreen(m_pCheckBoxDisableLockToScreen->isChecked());
     serverConfig().setClipboardSharingSize(m_pSpinBoxClipboardSizeLimit->value() * 1024);
 	serverConfig().setClipboardSharing(m_pCheckBoxEnableClipboard->isChecked() 
diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index a48ef9f31b..ca41dd4b66 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -455,13 +455,6 @@ Double click on a screen to edit its settings.</string>
             </item>
            </layout>
           </item>
-          <item row="5" column="0">
-           <widget class="QCheckBox" name="m_pCheckBoxEnableDragAndDrop">
-            <property name="text">
-             <string>Enable drag and drop file transfers</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="0">
            <widget class="QCheckBox" name="m_pCheckBoxWin32KeepForeground">
             <property name="enabled">
@@ -555,16 +548,6 @@ Double click on a screen to edit its settings.</string>
             </item>
            </layout>
           </item>
-          <item row="2" column="0">
-           <widget class="QCheckBox" name="m_pCheckBoxScreenSaverSync">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>S&amp;ynchronize screen savers</string>
-            </property>
-           </widget>
-          </item>
           <item row="6" column="0">
            <widget class="QCheckBox" name="m_pCheckBoxDisableLockToScreen">
             <property name="text">