diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
index d5874730c..d3faf47f4 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
@@ -242,6 +242,11 @@ private void initDefaults()
             historySizeSpinner.setEnabled(false);
         }
 
+        if (!ConfigurationManager.isHistoryShown())
+        {
+            historySizeSpinner.setEnabled(false);
+        }
+
         sendMessageComboBox.setSelectedItem(
             ConfigurationManager.getSendMessageCommand());