diff --git a/src/BirdsiteLive.Domain/ActivityPubService.cs b/src/BirdsiteLive.Domain/ActivityPubService.cs
index b9b248e..043a7fd 100644
--- a/src/BirdsiteLive.Domain/ActivityPubService.cs
+++ b/src/BirdsiteLive.Domain/ActivityPubService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -89,6 +90,10 @@ namespace BirdsiteLive.Domain
                 //}
             };
 
+            //TODO Remove this
+            if (targetInbox.Contains(targetHost))
+                targetInbox = targetInbox.Split(new []{ targetHost }, StringSplitOptions.RemoveEmptyEntries).Last();
+
             return await PostDataAsync(noteActivity, targetHost, actor, targetInbox);
         }