diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index 76b5a8e39..098f4b6a1 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -534,7 +534,7 @@ public abstract class ConnectionConfiguration {
     /**
      * Returns the stream language to use when connecting to the server.
      *
-     * @return the stream language to use when connecting to the server.
+     * @return the stream language to use when connecting to the server or <code>null</code>.
      */
     public Locale getLanguage() {
         return language;