diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java
index 9168d6e61..07c36d127 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java
@@ -18,6 +18,7 @@ import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 public class MediaCCCStreamExtractor extends StreamExtractor {
 
@@ -248,8 +249,8 @@ public class MediaCCCStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public String getLanguageInfo() throws ParsingException {
-        return "";
+    public Locale getLanguageInfo() throws ParsingException {
+        return null;
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
index e6e32d44a..80cae88a6 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
@@ -6,6 +6,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 import org.jsoup.helper.StringUtil;
 import org.schabi.newpipe.extractor.MediaFormat;
@@ -391,7 +392,11 @@ public class PeertubeStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public String getLanguageInfo() throws ParsingException {
-        return JsonUtils.getString(json, "language.label");
+    public Locale getLanguageInfo() throws ParsingException {
+        try {
+            return new Locale(JsonUtils.getString(json, "language.id"));
+        } catch (ParsingException e) {
+            return null;
+        }
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
index c5d34bd01..5b1153d54 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
@@ -20,6 +20,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 public class SoundcloudStreamExtractor extends StreamExtractor {
     private JsonObject track;
@@ -276,8 +277,8 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public String getLanguageInfo() throws ParsingException {
-        return "";
+    public Locale getLanguageInfo() throws ParsingException {
+        return null;
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index dcf302cbd..10ffb1432 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -1157,8 +1157,8 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public String getLanguageInfo() throws ParsingException {
-        return "";
+    public Locale getLanguageInfo() throws ParsingException {
+        return null;
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
index 31a5a583b..652e0116a 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
@@ -35,6 +35,7 @@ import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Scrapes information from a video/audio streaming service (eg, YouTube).
@@ -390,13 +391,15 @@ public abstract class StreamExtractor extends Extractor {
     public abstract String getLicence() throws ParsingException;
 
     /**
-     * The language of the stream.
-     * If the language is not available you can simply return an empty string.
-     * @return the licence of the stream or an empty String.
+     * The locale language of the stream.
+     * If the language is not available you can simply return null.
+     * If the language is provided by a language code, you can return
+     * new Locale(language_code);
+     * @return the locale language of the stream or null.
      * @throws ParsingException
      */
-    @Nonnull
-    public abstract String getLanguageInfo() throws ParsingException;
+    @Nullable
+    public abstract Locale getLanguageInfo() throws ParsingException;
 
     /**
      * The list of tags of the stream.
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
index e32a133d0..64999ce79 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
@@ -13,6 +13,7 @@ import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /*
  * Created by Christian Schabesberger on 26.08.15.
@@ -349,8 +350,8 @@ public class StreamInfo extends Info {
     private String privacy = "";
     private String category = "";
     private String licence = "";
-    private String language = "";
     private String support = "";
+    private Locale language = null;
     private List<String> tags = new ArrayList<>();
 
     /**
@@ -610,11 +611,11 @@ public class StreamInfo extends Info {
         this.licence = str;
     }
 
-    public String getLanguageInfo() {
+    public Locale getLanguageInfo() {
         return this.language;
     }
 
-    public void setLanguageInfo(String lang) {
+    public void setLanguageInfo(Locale lang) {
         this.language = lang;
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java
index c6a164f74..06a8352cc 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Locale;
 
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -154,4 +155,9 @@ public class PeertubeStreamExtractorDefaultTest {
         supportInfoExtractor.fetchPage();
         assertEquals("https://utip.io/chatsceptique", supportInfoExtractor.getSupportInfo());
     }
+
+    @Test
+    public void testGetLanguageInformation() throws ParsingException {
+        assertEquals(new Locale("en"), extractor.getLanguageInfo());
+    }
 }