diff --git a/src/views/ChoreEdit/ChoreEdit.jsx b/src/views/ChoreEdit/ChoreEdit.jsx
index c1b4af3..44425fa 100644
--- a/src/views/ChoreEdit/ChoreEdit.jsx
+++ b/src/views/ChoreEdit/ChoreEdit.jsx
@@ -1223,9 +1223,10 @@ const ChoreEdit = () => {
             )}
 
             {/* Expires After (Deadline) */}
-            <FormControl sx={{ mt: 2 }}>
+            {/* <FormControl sx={{ mt: 2 }}>
               <Checkbox
                 checked={deadlineOffset !== -1}
+                disabled={isRolling}
                 onChange={e => {
                   if (e.target.checked) {
                     setDeadlineOffset(86400) // default 1 day in seconds
@@ -1237,9 +1238,11 @@ const ChoreEdit = () => {
                 label='Set a deadline'
               />
               <FormHelperText>
-                Task will be considered expired after the due date
+                {isRolling && !['once', 'no_repeat'].includes(frequencyType)
+                  ? 'Deadline is not available when scheduling from completion date'
+                  : 'Task will be considered expired after the due date'}
               </FormHelperText>
-            </FormControl>
+            </FormControl> */}
 
             {deadlineOffset !== -1 && (
               <Box
@@ -1286,7 +1289,10 @@ const ChoreEdit = () => {
                 <Radio
                   overlay
                   checked={isRolling}
-                  onClick={() => setIsRolling(true)}
+                  onClick={() => {
+                    setIsRolling(true)
+                    setDeadlineOffset(-1)
+                  }}
                   label='Reschedule from completion date'
                 />
                 <FormHelperText>
diff --git a/src/views/components/AddTaskModal.jsx b/src/views/components/AddTaskModal.jsx
index 4e83499..f70abb6 100644
--- a/src/views/components/AddTaskModal.jsx
+++ b/src/views/components/AddTaskModal.jsx
@@ -20,7 +20,6 @@ import {
 } from './CustomParsers'
 import SmartTaskTitleInput from './SmartTaskTitleInput'
 
-import DurationInput from '../../components/common/DurationInput'
 import KeyboardShortcutHint from '../../components/common/KeyboardShortcutHint'
 import NotificationTemplate from '../../components/NotificationTemplate'
 import LearnMoreButton from './LearnMore'
@@ -804,7 +803,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
             Edit Notifications
           </Button>
         )}
-        {!hasDeadline && dueDate && (
+        {/* {!hasDeadline && dueDate && (
           <Button
             startDecorator={<Add />}
             variant='plain'
@@ -816,7 +815,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
           >
             Set Deadline
           </Button>
-        )}
+        )} */}
       </Box>
 
       {hasDescription && (
@@ -978,7 +977,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
                 )}
               </Box>
             </FormControl> */}
-        {hasDeadline && dueDate && (
+        {/* {hasDeadline && dueDate && (
           <Box
             sx={{
               flexDirection: 'column',
@@ -998,7 +997,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => {
               <Typography level='body-sm'>after due date</Typography>
             </Box>
           </Box>
-        )}
+        )} */}
         {hasNotifications && dueDate && (
           <Box
             sx={{