diff --git a/pkg/filemanager/manager/upload.go b/pkg/filemanager/manager/upload.go
index a7d375a0..a4792676 100644
--- a/pkg/filemanager/manager/upload.go
+++ b/pkg/filemanager/manager/upload.go
@@ -297,13 +297,16 @@ func (m *manager) CompleteUpload(ctx context.Context, session *fs.UploadSession)
 	}
 
 	var (
-		file fs.File
+		file    fs.File
+		ownerId int
 	)
 	if m.fs != nil {
 		file, err = m.fs.CompleteUpload(ctx, session)
 		if err != nil {
 			return nil, fmt.Errorf("failed to complete upload: %w", err)
 		}
+
+		ownerId = file.OwnerID()
 	}
 
 	if session.SentinelTaskID > 0 {
@@ -314,7 +317,7 @@ func (m *manager) CompleteUpload(ctx context.Context, session *fs.UploadSession)
 		}
 	}
 
-	m.onNewEntityUploaded(ctx, session, d, file.OwnerID())
+	m.onNewEntityUploaded(ctx, session, d, ownerId)
 	// Remove upload session
 	_ = m.kv.Delete(UploadSessionCachePrefix, session.Props.UploadSessionID)
 	return file, nil