diff --git a/storage/handlers/files.go b/storage/handlers/files.go
index 99ce69824..488e9e0e9 100644
--- a/storage/handlers/files.go
+++ b/storage/handlers/files.go
@@ -383,20 +383,22 @@ func (h *FilesHandler) listHandler(c echo.Context, public bool) error {
 	}
 
 	var userId *int64
+	var overrideChatId, overrideMessageId int64
 	if !public {
 		if userPrincipalDto == nil {
 			return c.NoContent(http.StatusUnauthorized)
 		} else {
 			userId = &userPrincipalDto.UserId
 		}
+		overrideChatId = utils.ChatIdNonExistent
+		overrideMessageId = utils.MessageIdNonExistent
+	} else { // userPrincipalDto == nil and userId == nil
+		overrideChatId = getOverrideChatIdPublic(c)
+		overrideMessageId = getOverrideMessageIdPublic(c)
 	}
-	// else userPrincipalDto == nil and userId == nil
 
 	fileItemUuid := c.QueryParam("fileItemUuid")
 
-	overrideChatId := getOverrideChatIdPublic(c)
-	overrideMessageId := getOverrideMessageIdPublic(c)
-
 	if ok, err := h.restClient.CheckAccessExtended(c.Request().Context(), userId, chatId, overrideChatId, overrideMessageId, fileItemUuid); err != nil {
 		return c.NoContent(http.StatusInternalServerError)
 	} else if !ok {