diff --git a/apps/dokploy/components/dashboard/projects/handle-project.tsx b/apps/dokploy/components/dashboard/projects/handle-project.tsx
index d9aad3b8e..a98c81b00 100644
--- a/apps/dokploy/components/dashboard/projects/handle-project.tsx
+++ b/apps/dokploy/components/dashboard/projects/handle-project.tsx
@@ -101,9 +101,12 @@ export const HandleProject = ({ projectId }: Props) => {
 				toast.success(projectId ? "Project Updated" : "Project Created");
 				setIsOpen(false);
 				if (!projectId) {
-					router.push(
-						`/dashboard/project/${data?.project?.projectId}/environment/${data?.environment?.environmentId}`,
-					);
+					const projectIdToUse =  data && 'project' in data ? data.project.projectId : undefined;
+					const environmentIdToUse = data && 'environment' in data ? data.environment.environmentId : undefined;
+					
+					if (environmentIdToUse && projectIdToUse) {
+						router.push(`/dashboard/project/${projectIdToUse}/environment/${environmentIdToUse}`);
+					} 
 				} else {
 					refetch();
 				}