diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
index a8d5f7711221e505d6d84d05ef17931511cb1cd7..e9559e361b8f755544614ae4f5aa678bc497c6c0 100644
--- a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
@@ -99,13 +99,13 @@ class CommentPropertiesPlugin extends ServerPlugin {
 	 */
 	public function getCommentsLink(Node $node) {
 		$href =  $this->server->getBaseUri();
-		$entryPoint = strrpos($href, '/webdav/');
+		$entryPoint = strpos($href, '/remote.php/');
 		if($entryPoint === false) {
 			// in case we end up somewhere else, unexpectedly.
 			return null;
 		}
-		$href = substr_replace($href, '/dav/', $entryPoint);
-		$href .= 'comments/files/' . rawurldecode($node->getId());
+		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
 		return $href;
 	}
 
diff --git a/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php b/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php
index f915c83c4a7b382031f228edd8d7d1b27f396515..f7f87e01544ec117ed5e6583fa9a15a59bb3ef2d 100644
--- a/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php
+++ b/apps/dav/tests/unit/connector/sabre/commentpropertiesplugin.php
@@ -84,7 +84,8 @@ class CommentsPropertiesPlugin extends \Test\TestCase {
 	public function baseUriProvider() {
 		return [
 			['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
-			['owncloud/remote.php/wicked/', '4567', null]
+			['owncloud/remote.php/files/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
+			['owncloud/wicked.php/files/', '4567', null]
 		];
 	}