diff --git a/mRemoteV1/Messages/MessageCollector.cs b/mRemoteV1/Messages/MessageCollector.cs
index 77eac1607..5da1819e9 100644
--- a/mRemoteV1/Messages/MessageCollector.cs
+++ b/mRemoteV1/Messages/MessageCollector.cs
@@ -61,18 +61,18 @@ namespace mRemoteNG.Messages
             if (onlyLog)
                 return;
 
-            if (Settings.Default.ShowNoMessageBoxes)
-            {
-                /* These if statements need to be split so we can:
-                 * control that no messages boxes will be dispalyed
-                 * add items to the notifications panel
-                 * NOT switch to the notification panel if configured that way
-                 */
-                if(enableTimer)
-                    _ecTimer.Enabled = true;
-            }
-            else
-                ShowMessageBox(nMsg);
+            //if (Settings.Default.ShowNoMessageBoxes)
+            //{
+            //    /* These if statements need to be split so we can:
+            //     * control that no messages boxes will be dispalyed
+            //     * add items to the notifications panel
+            //     * NOT switch to the notification panel if configured that way
+            //     */
+            //    if(enableTimer)
+            //        _ecTimer.Enabled = true;
+            //}
+            //else
+            //    ShowMessageBox(nMsg);
 
             var lvItem = BuildListViewItem(nMsg);
             AddToList(lvItem);
diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs
index f901104ea..923ae6ae2 100644
--- a/mRemoteV1/Properties/Settings.Designer.cs
+++ b/mRemoteV1/Properties/Settings.Designer.cs
@@ -95,18 +95,6 @@ namespace mRemoteNG {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ShowNoMessageBoxes {
-            get {
-                return ((bool)(this["ShowNoMessageBoxes"]));
-            }
-            set {
-                this["ShowNoMessageBoxes"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings
index 0519cc56d..4364b64a3 100644
--- a/mRemoteV1/Properties/Settings.settings
+++ b/mRemoteV1/Properties/Settings.settings
@@ -20,9 +20,6 @@
     <Setting Name="CustomPuttyPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ShowNoMessageBoxes" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
     <Setting Name="SwitchToMCOnInformation" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 45ec57a2f..97c592c97 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -52,9 +52,6 @@
       <setting name="CustomPuttyPath" serializeAs="String">
         <value />
       </setting>
-      <setting name="ShowNoMessageBoxes" serializeAs="String">
-        <value>True</value>
-      </setting>
       <setting name="SwitchToMCOnInformation" serializeAs="String">
         <value>True</value>
       </setting>