diff --git a/src/Ombi.Api.Mattermost/Models/MattermostClient.cs b/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
index 33489ac57..ad04947b1 100644
--- a/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
+++ b/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
@@ -155,7 +155,7 @@ namespace Ombi.Api.Mattermost.Models
 
                 foreach (var msg in outMessages)
                 {
-                    var request = new Request("", _webhookUrl.ToString(), HttpMethod.Post);
+                    var request = new Request(_webhookUrl.ToString(), "", HttpMethod.Post);
                     request.AddJsonBody(msg);
                     request.AddHeader("Host", _webhookUrl.Host);
                     await api.Request(request);
diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs
index 376ce6e92..98fff5e0c 100644
--- a/src/Ombi.Api/Api.cs
+++ b/src/Ombi.Api/Api.cs
@@ -106,15 +106,7 @@ namespace Ombi.Api
 
         public async Task Request(Request request)
         {
-            object url;
-            if (request.JsonBody.ToString().Contains("Mattermost"))
-            {
-                url = request.BaseUrl;
-            } else
-            {
-                url = request.FullUri;
-            }
-            using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, url.ToString()))
+            using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, request.FullUri))
             {
                 AddHeadersBody(request, httpRequestMessage);
                 var httpResponseMessage = await _client.SendAsync(httpRequestMessage);