diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala
index 6dda84aafc..1da7d6ddad 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala
+++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala
@@ -56,7 +56,7 @@ object LanguageRange {
   def apply(language: Language, qValue: Float): LanguageRange = One(language, qValue)
 
   JavaInitialization.initializeStaticFieldWith(
-    `*`, classOf[jm.headers.HttpOriginRange].getField("ALL"))
+    `*`, classOf[jm.headers.LanguageRange].getField("ALL"))
 
 }
 
diff --git a/akka-http-core/src/test/scala/akka/http/javadsl/JavaInitializationSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/JavaInitializationSpec.scala
new file mode 100644
index 0000000000..fbed941271
--- /dev/null
+++ b/akka-http-core/src/test/scala/akka/http/javadsl/JavaInitializationSpec.scala
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+ */
+
+package akka.http.javadsl
+
+import org.scalatest.{ Matchers, WordSpec }
+
+class JavaInitializationSpec extends WordSpec with Matchers {
+
+  "LanguageRange" should {
+
+    "initializes the right field" in {
+      akka.http.scaladsl.model.headers.LanguageRange.`*` // first we touch the scala one, it should force init the Java one
+      akka.http.javadsl.model.headers.LanguageRange.ALL // touching this one should not fail
+      akka.http.javadsl.model.headers.LanguageRanges.ALL // this is recommended and should work well too
+    }
+  }
+}