diff --git a/src/Umbraco.Web/Media/EmbedProviders/Giphy.cs b/src/Umbraco.Web/Media/EmbedProviders/Giphy.cs
new file mode 100644
index 0000000000..1069de749c
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Giphy.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    /// <summary>
+    /// Embed Provider for Giphy.com the popular online GIFs and animated sticker provider.
+    /// </summary>
+    public class Giphy : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://giphy.com/services/oembed?url=";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"giphy\.com/*",
+            @"gph\.is/*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index a37f9c3588..e2b6313ca6 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -264,7 +264,9 @@ namespace Umbraco.Web.Runtime
                 .Append<Ted>()
                 .Append<Soundcloud>()
                 .Append<Issuu>()
-                .Append<Hulu>();
+                .Append<Hulu>()
+                .Append<Giphy>();
+            
 
             // replace with web implementation
             composition.RegisterUnique<IPublishedSnapshotRebuilder, Migrations.PostMigrations.PublishedSnapshotRebuilder>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8d1b106ba4..e604ddba6f 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -149,6 +149,7 @@
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
     <Compile Include="Macros\IMacroRenderer.cs" />
+    <Compile Include="Media\EmbedProviders\Giphy.cs" />
     <Compile Include="Media\EmbedProviders\YouTube.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProviderBase.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollection.cs" />