diff --git a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
index 37142879..061be894 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -142,6 +142,16 @@ public class ConfigXml {
             }
         }
 
+        // Enforce TLS.
+        Element gui = (Element) mConfig.getDocumentElement()
+                .getElementsByTagName("gui").item(0);
+        boolean tls = Boolean.parseBoolean(gui.getAttribute("tls"));
+        if (!tls) {
+            Log.i(TAG, "Enforce TLS");
+            gui.setAttribute("tls", Boolean.toString(true));
+            changed = true;
+        }
+
         // Update deprecated 8080 port to 8384
         NodeList addressList = gui.getElementsByTagName("address");
         for (int i = 0; i < addressList.getLength(); i++) {
diff --git a/src/main/res/xml/app_settings.xml b/src/main/res/xml/app_settings.xml
index af872291..f64c5aab 100644
--- a/src/main/res/xml/app_settings.xml
+++ b/src/main/res/xml/app_settings.xml
@@ -100,12 +100,6 @@
                 android:key="gui_password"
                 android:title="@string/gui_password" />
 
-            <CheckBoxPreference
-                android:key="UseTLS"
-                android:title="@string/gui_https_enabled"
-                android:enabled="false"
-                android:persistent="false" />
-
         </PreferenceScreen>
 
         <Preference