diff --git a/js/plugins.js b/js/plugins.js
index 2dcabc4..8218f78 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -553,8 +553,42 @@ plugins.factory('userPlugins', function() {
         }
     });
 
+    /*
+     * TikTok embedded player
+     * Very similar to twitter
+     */
+    var tikTokPlugin = new UrlPlugin('TikTok', function(url) {
+        var regex = /^https?:\/\/(www\.)?tiktok\.com\/@(.+)\/video\/(.+)/i,
+            match = url.match(regex);
+
+        if (match) {
+
+            return function() {
+                var element = this.getElement();
+                
+                fetch("https://www.tiktok.com/oembed?url=" + url)
+                .then(function(response) {
+                    return response.json();
+                    })
+                .then(function(data) {
+                    // separate the HTML into content and script tag
+                    var scriptIndex = data.html.indexOf("<script ");
+                    var content = data.html.substr(0, scriptIndex);
+
+                    element.innerHTML = content;
+
+                    // The script tag needs to be generated manually or the browser won't load it
+                    var scriptElem = document.createElement('script');
+                    // Hardcoding the URL here, I don't suppose it's going to change anytime soon
+                    scriptElem.src = "https://www.tiktok.com/embed.js";
+                    element.appendChild(scriptElem);
+                });
+            };
+        }
+    });
+
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, streamablePlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, streamablePlugin, tikTokPlugin]
     };
 
 
diff --git a/test/unit/plugins.js b/test/unit/plugins.js
index 10a7e53..9d646ab 100644
--- a/test/unit/plugins.js
+++ b/test/unit/plugins.js
@@ -169,5 +169,15 @@ describe('filter', function() {
             plugins);
         }));
 
+        it('should recognize tiktoks', inject(function(plugins) {
+            expectTheseMessagesToContain([
+                'https://www.tiktok.com/@scout2015/video/6718335390845095173',
+                'https://www.tiktok.com/@lewiscatpaldi/video/6800461190058298629',
+                'https://www.tiktok.com/@bhattrai_fam5_kavita/video/6811222914768047365',
+            ],
+            'TikTok',
+            plugins);
+        }));
+
     });
 });