diff --git a/object/avatar.go b/object/avatar.go
index 14f0188b..2eb43517 100644
--- a/object/avatar.go
+++ b/object/avatar.go
@@ -51,6 +51,10 @@ func downloadFile(url string) (*bytes.Buffer, error) {
 }
 
 func getPermanentAvatarUrl(organization string, username string, url string) string {
+	if url == "" {
+		return ""
+	}
+
 	if defaultStorageProvider == nil {
 		return ""
 	}