diff --git a/core/client_term.js b/core/client_term.js
index b65690e0..253e5dd3 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -42,6 +42,10 @@ function ClientTerminal(output) {
         },
         set: function (enc) {
             if (iconv.encodingExists(enc)) {
+                Log.info(
+                    { encoding: enc, currentEncoding: outputEncoding },
+                    'Setting client encoding.'
+                );
                 outputEncoding = enc;
             } else {
                 Log.warn({ encoding: enc }, 'Unknown encoding');
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 73d604a5..56479f8b 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -247,13 +247,6 @@ function setClientEncoding(callingMenu, formData, extraArgs, cb) {
     const client = callingMenu.client;
     let encoding = formData.value.encoding;
 
-    client.log.info(
-        { encoding: encoding, currentEncoding: client.term.outputEncoding },
-        'Setting client encoding.'
-    );
-
-    encoding = encoding || client.term.outputEncoding;
-
     client.term.outputEncoding = encoding;
 
     return callingMenu.nextMenu(cb);