diff --git a/client/src/App.tsx b/client/src/App.tsx
index ba23c97..4e36d3c 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -350,6 +350,7 @@ function App() {
   }
 
   const noOrders = data?.pizzaDay?.orders?.length === 0;
+  const canChangeChoice = dayIndex == null || data.todayWeekIndex == null || dayIndex >= data.todayWeekIndex;
 
   return (
     <>
@@ -376,7 +377,7 @@ function App() {
           </Row>
           <div className='content-wrapper'>
             <div className='content'>
-              {(dayIndex == null || data.todayWeekIndex == null || dayIndex >= data.todayWeekIndex) && <>
+              {canChangeChoice && <>
                 <p>{`Jak to ${dayIndex == null || dayIndex === data.todayWeekIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
                 <Form.Select ref={choiceRef} onChange={doAddChoice}>
                   <option></option>
@@ -432,7 +433,7 @@ function App() {
                                       </span>}
                                       {login}
                                       {userPayload.departureTime && <small> ({userPayload.departureTime})</small>}
-                                      {login === auth.login && <FontAwesomeIcon onClick={() => {
+                                      {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
                                         doRemoveChoices(locationKey);
                                       }} title={`Odstranit volbu ${locationName}, včetně případných zvolených jídel`} className='action-icon' icon={faTrashCan} />}
                                     </td>
@@ -445,7 +446,7 @@ function App() {
                                           const foodName = food[restaurant]?.food[foodIndex].name;
                                           return <li key={foodIndex}>
                                             {foodName}
-                                            {login === auth.login && <FontAwesomeIcon onClick={() => {
+                                            {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
                                               doRemoveFoodChoice(locationKey, foodIndex);
                                             }} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />}
                                           </li>