diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java
index 8a00280a43..c78d3986e7 100644
--- a/src/org/thoughtcrime/securesms/TransportOptions.java
+++ b/src/org/thoughtcrime/securesms/TransportOptions.java
@@ -67,8 +67,13 @@ public class TransportOptions {
 
   public void disableTransport(Type type) {
     Optional<TransportOption> option = find(type);
+
     if (option.isPresent()) {
       enabledTransports.remove(option.get());
+
+      if (manuallySelected && type == selectedType) {
+        manuallySelected = false;
+      }
     }
   }