diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 78d4a51cf1681..fd8763f46b9b5 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -555,11 +555,11 @@ public function getAvatarImage($size) {
 	 */
 	public function getCloudId() {
 		$uid = $this->getUID();
-		$server = $this->urlGenerator->getAbsoluteURL('/');
+		$server = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
 		if (substr($server, -10) === '/index.php') {
 			$server = substr($server, 0, -10);
 		}
-		$server = rtrim($this->removeProtocolFromUrl($server), '/');
+		$server = $this->removeProtocolFromUrl($server);
 		return $uid . '@' . $server;
 	}