diff --git a/src/pages/superadmin/CreateTenantWizard.tsx b/src/pages/superadmin/CreateTenantWizard.tsx
index 0a2c079..8c9375c 100644
--- a/src/pages/superadmin/CreateTenantWizard.tsx
+++ b/src/pages/superadmin/CreateTenantWizard.tsx
@@ -186,6 +186,8 @@ const CreateTenantWizard = (): ReactElement => {
   const [isUploadingFavicon, setIsUploadingFavicon] = useState<boolean>(false);
   const [logoError, setLogoError] = useState<string | null>(null);
   const [faviconError, setFaviconError] = useState<string | null>(null);
+  const [wizardId] = useState(() => crypto.randomUUID());
+
 
   // Auto-generate slug and domain from name
   const nameValue = tenantDetailsForm.watch('name');
@@ -940,9 +942,9 @@ const CreateTenantWizard = (): ReactElement => {
                             setLogoPreviewUrl(previewUrl);
                             setIsUploadingLogo(true);
                             try {
-                              const slug = tenantDetailsForm.getValues('slug');
-                              const response = await fileService.upload(file, slug || 'tenant');
+                              const response = await fileService.upload(file, 'tenant', wizardId);
                               const fileId = response.data.id;
+
                               setLogoFileAttachmentUuid(fileId);
 
                               const baseUrl = getBaseUrlWithProtocol();
@@ -1050,9 +1052,9 @@ const CreateTenantWizard = (): ReactElement => {
                             setFaviconPreviewUrl(previewUrl);
                             setIsUploadingFavicon(true);
                             try {
-                              const slug = tenantDetailsForm.getValues('slug');
-                              const response = await fileService.upload(file, slug || 'tenant');
+                              const response = await fileService.upload(file, 'tenant', wizardId);
                               const fileId = response.data.id;
+
                               setFaviconFileAttachmentUuid(fileId);
 
                               const baseUrl = getBaseUrlWithProtocol();