diff --git a/main/src/ui/conversation_view_controller.vala b/main/src/ui/conversation_view_controller.vala
index fadd34dd..9ab4e5b8 100644
--- a/main/src/ui/conversation_view_controller.vala
+++ b/main/src/ui/conversation_view_controller.vala
@@ -171,19 +171,8 @@ public class ConversationViewController : Object {
                 });
 
                 selection_dialog.response.connect((response_id) => {
-                    if (response_id == Gtk.ResponseType.DELETE_EVENT) {
-                        conversation.encryption = NONE;
-                    }
-                    else {
+                    if (response_id >= 0) {
                         conversation.encryption = response_id;
-
-                        if (selected_default != NONE) {
-                            settings.default_encryption = response_id;
-                        }
-                        else {
-                            // Set conversation as unencrypted, but keep
-                            // default encryption setting as undecided.
-                        }
                     }
                 });