diff --git a/apps/web/app/hooks/features/useTimer.ts b/apps/web/app/hooks/features/useTimer.ts
index 5599f114e..6f1b28515 100644
--- a/apps/web/app/hooks/features/useTimer.ts
+++ b/apps/web/app/hooks/features/useTimer.ts
@@ -193,6 +193,11 @@ export function useTimer() {
 			plan.tasks?.length > 0
 	);
 
+	const tomorrow = moment().add(1, 'days');
+	const hasPlanForTomorrow = myDailyPlans.items.find(
+		(plan) => moment(plan.date).format('YYYY-MM-DD') === tomorrow.format('YYYY-MM-DD')
+	);
+
 	// Team setting that tells if each member must have a today plan for allowing tracking time
 	const requirePlan = activeTeam?.requirePlanToTrack;
 
@@ -420,6 +425,7 @@ export function useTimer() {
 		startTimer,
 		stopTimer,
 		hasPlan,
+		hasPlanForTomorrow,
 		canRunTimer,
 		canTrack,
 		isPlanVerified,
@@ -460,6 +466,7 @@ export function useTimerView() {
 		startTimer,
 		stopTimer,
 		hasPlan,
+		hasPlanForTomorrow,
 		canRunTimer,
 		canTrack,
 		isPlanVerified,
@@ -491,6 +498,7 @@ export function useTimerView() {
 		timerStatus,
 		activeTeamTask,
 		hasPlan,
+		hasPlanForTomorrow,
 		disabled: !canRunTimer,
 		canTrack,
 		isPlanVerified,
diff --git a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
index a60d3dfac..8491d203a 100644
--- a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
+++ b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
@@ -35,7 +35,9 @@ export function CreateDailyPlanFormModal({
 	const { handleSubmit, reset } = useForm();
 	const { user } = useAuthenticateUser();
 	const { activeTeam, activeTeamManagers } = useOrganizationTeams();
-	const { createDailyPlan, createDailyPlanLoading } = useDailyPlan();
+	const { createDailyPlan, createDailyPlanLoading, profileDailyPlans } = useDailyPlan();
+
+	const existingPlanDates = profileDailyPlans.items.map((plan) => new Date(plan.date));
 
 	const isManagerConnectedUser = activeTeamManagers.find((member) => member.employee?.user?.id == user?.id);
 
@@ -119,7 +121,7 @@ export function CreateDailyPlanFormModal({
 										<Button
 											variant={'outline'}
 											className={cn(
-												'justify-start text-left font-normal py-6 rounded-lg',
+												'justify-start text-left font-normal py-6 rounded-lg dark:bg-dark--theme-light dark:border-slate-700',
 												!date && 'text-muted-foreground'
 											)}
 										>
@@ -127,13 +129,17 @@ export function CreateDailyPlanFormModal({
 											{date ? moment(date).format('DD.MM.YYYY') : <span>Pick a date</span>}
 										</Button>
 									</PopoverTrigger>
-									<PopoverContent className="w-full p-0 z-[9999]">
+									<PopoverContent className="w-full p-0 z-[9999] dark:!border-slate-700">
 										<Calendar
 											mode="single"
+											className="dark:bg-dark--theme-light"
 											selected={date}
 											onSelect={(day) => setDate(day ? day : new Date(tomorrowDate))}
 											initialFocus
-											disabled={{ from: new Date(1970, 1, 1), to: tomorrowDate }}
+											disabled={[
+												...existingPlanDates,
+												{ from: new Date(1970, 1, 1), to: tomorrowDate }
+											]}
 										/>
 									</PopoverContent>
 								</Popover>
diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx
index 1db976457..64b03790d 100644
--- a/apps/web/lib/features/task/task-card.tsx
+++ b/apps/web/lib/features/task/task-card.tsx
@@ -500,6 +500,7 @@ function TaskCardMenu({
 	}, [memberInfo, task, viewType]);
 
 	const canSeeActivity = useCanSeeActivityScreen();
+	const { hasPlan, hasPlanForTomorrow } = useTimerView();
 
 	return (
 		<Popover>
@@ -556,6 +557,7 @@ function TaskCardMenu({
 														planMode="today"
 														taskId={task.id}
 														employeeId={profile?.member?.employeeId ?? ''}
+														hasTodayPlan={hasPlan}
 													/>
 												</li>
 												<li className="mb-2">
@@ -563,6 +565,7 @@ function TaskCardMenu({
 														planMode="tomorow"
 														taskId={task.id}
 														employeeId={profile?.member?.employeeId ?? ''}
+														hasPlanForTomorrow={hasPlanForTomorrow}
 													/>
 												</li>
 												<li className="mb-2">
@@ -599,7 +602,7 @@ function TaskCardMenu({
 																plan={plan}
 															/>
 														</div>
-														<div className='mt-2'>
+														<div className="mt-2">
 															<RemoveManyTaskFromPlan
 																task={task}
 																member={profile?.member}
@@ -642,12 +645,16 @@ export function PlanTask({
 	planMode,
 	taskId,
 	employeeId,
-	chooseMember
+	chooseMember,
+	hasTodayPlan,
+	hasPlanForTomorrow
 }: {
 	taskId: string;
 	planMode: IDailyPlanMode;
 	employeeId?: string;
 	chooseMember?: boolean;
+	hasTodayPlan?: IDailyPlan;
+	hasPlanForTomorrow?: IDailyPlan;
 }) {
 	const t = useTranslations();
 	const [isPending, startTransition] = useTransition();
@@ -702,7 +709,7 @@ export function PlanTask({
 					employeeId={employeeId}
 					chooseMember={chooseMember}
 				/>
-				{planMode === 'today' && (
+				{planMode === 'today' && !hasTodayPlan && (
 					<span>
 						{isPending ? (
 							<ReloadIcon className="animate-spin mr-2 h-4 w-4" />
@@ -711,7 +718,7 @@ export function PlanTask({
 						)}
 					</span>
 				)}
-				{planMode === 'tomorow' && (
+				{planMode === 'tomorow' && !hasPlanForTomorrow && (
 					<span>
 						{isPending ? (
 							<ReloadIcon className="animate-spin mr-2 h-4 w-4" />
@@ -763,7 +770,7 @@ export function RemoveTaskFromPlan({ task, plan, member }: { task: ITeamTask; me
 	);
 }
 
-export function RemoveManyTaskFromPlan({ task, member }: { task: ITeamTask; member?: OT_Member; }) {
+export function RemoveManyTaskFromPlan({ task, member }: { task: ITeamTask; member?: OT_Member }) {
 	// const t = useTranslations();
 	const { removeManyTaskPlans } = useDailyPlan();
 	const data: IRemoveTaskFromManyPlans = { plansIds: [], employeeId: member?.employeeId };