diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
index e2f9235ee..3eb5dbf94 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
@@ -455,13 +455,7 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
         if (language == null && this.language != null) {
             return this.language;
         }
-        else if (language == null) {
-            return getDefaultLanguage();
-        }
-        else {
-            return language;
-        }
-
+        return language;
     }
 
     @Override