diff --git a/daemon.py b/daemon.py
index bafbdf77..6692247a 100644
--- a/daemon.py
+++ b/daemon.py
@@ -750,7 +750,7 @@ class PubServer(BaseHTTPRequestHandler):
             return
 
         # like from the web interface icon
-        if authorized and '?like=' in self.path:
+        if authorized and '?like=' in self.path and '/statuses/' in self.path:
             likeUrl=self.path.split('?like=')[1]
             actor=self.path.split('?like=')[0]
             self.postToNickname=getNicknameFromActor(actor)
@@ -758,12 +758,13 @@ class PubServer(BaseHTTPRequestHandler):
                 self.server.session= \
                     createSession(self.server.domain,self.server.port,self.server.useTor)
             likeActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname
+            actorLiked=self.path.split('/statuses/')[0]
             likeJson= {
                 'type': 'Like',
                 'actor': likeActor,
                 'object': likeUrl,
-                'to': [likeActor+'/followers'],
-                'cc': []
+                'to': [actorLiked],
+                'cc': [likeActor+'/followers']
             }    
             self._postToOutbox(likeJson)
             self.server.GETbusy=False
diff --git a/like.py b/like.py
index cc3b670e..4f0ddf8a 100644
--- a/like.py
+++ b/like.py
@@ -141,12 +141,16 @@ def like(session,baseDir: str,federationList: [],nickname: str,domain: str,port:
         if ':' not in domain:
             fullDomain=domain+':'+str(port)
 
+    likeTo=[]
+    if '/statuses/' in objectUrl:
+        likeTo=[objectUrl.split('/statuses/')[0]]
+
     newLikeJson = {
         'type': 'Like',
         'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname,
         'object': objectUrl,
-        'to': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers'],
-        'cc': []
+        'to': likeTo,
+        'cc': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers']
     }
     if ccList:
         if len(ccList)>0:
@@ -220,6 +224,10 @@ def undolike(session,baseDir: str,federationList: [],nickname: str,domain: str,p
         if ':' not in domain:
             fullDomain=domain+':'+str(port)
 
+    likeTo=[]
+    if '/statuses/' in objectUrl:
+        likeTo=[objectUrl.split('/statuses/')[0]]
+
     newUndoLikeJson = {
         'type': 'Undo',
         'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname,
@@ -227,11 +235,11 @@ def undolike(session,baseDir: str,federationList: [],nickname: str,domain: str,p
             'type': 'Like',
             'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname,
             'object': objectUrl,
-            'to': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers'],
-            'cc': []
+            'to': likeTo,
+            'cc': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers']
         },
-        'to': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers'],
-        'cc': []
+        'cc': [httpPrefix+'://'+fullDomain+'/users/'+nickname+'/followers'],
+        'to': likeTo
     }
     if ccList:
         if len(ccList)>0:
@@ -306,14 +314,17 @@ def sendLikeViaServer(session,fromNickname: str,password: str,
     if fromPort!=80 and fromPort!=443:
         fromDomainFull=fromDomain+':'+str(fromPort)
 
-    toUrl = 'https://www.w3.org/ns/activitystreams#Public'
+    toUrl = ['https://www.w3.org/ns/activitystreams#Public']
     ccUrl = httpPrefix + '://'+fromDomainFull+'/users/'+fromNickname+'/followers'
 
+    if '/statuses/' in likeUrl:
+        toUrl=[likeUrl.split('/statuses/')[0]]
+    
     newLikeJson = {
         'type': 'Like',
         'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname,
         'object': likeUrl,
-        'to': [toUrl],
+        'to': toUrl,
         'cc': [ccUrl]
     }
 
@@ -373,9 +384,12 @@ def sendUndoLikeViaServer(session,fromNickname: str,password: str,
     if fromPort!=80 and fromPort!=443:
         fromDomainFull=fromDomain+':'+str(fromPort)
 
-    toUrl = 'https://www.w3.org/ns/activitystreams#Public'
+    toUrl = ['https://www.w3.org/ns/activitystreams#Public']
     ccUrl = httpPrefix + '://'+fromDomainFull+'/users/'+fromNickname+'/followers'
 
+    if '/statuses/' in likeUrl:
+        toUrl=[likeUrl.split('/statuses/')[0]]
+
     newUndoLikeJson = {
         'type': 'Undo',
         'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname,
@@ -383,7 +397,7 @@ def sendUndoLikeViaServer(session,fromNickname: str,password: str,
             'type': 'Like',
             'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname,
             'object': likeUrl,
-            'to': [toUrl],
+            'to': toUrl,
             'cc': [ccUrl]
         }
     }