diff --git a/EditWorkout.tsx b/EditWorkout.tsx
index 9273eb6..1ae4561 100644
--- a/EditWorkout.tsx
+++ b/EditWorkout.tsx
@@ -146,22 +146,26 @@ export default function EditWorkout() {
           keyboardType="numeric"
           onSubmitEditing={() => minutesRef.current?.focus()}
         />
-        <MassiveInput
-          innerRef={minutesRef}
-          onSubmitEditing={() => secondsRef.current?.focus()}
-          value={minutes}
-          onChangeText={setMinutes}
-          label="Rest minutes"
-          keyboardType="numeric"
-        />
-        <MassiveInput
-          innerRef={secondsRef}
-          value={seconds}
-          onChangeText={setSeconds}
-          label="Rest seconds"
-          keyboardType="numeric"
-          blurOnSubmit
-        />
+        {!!settings.alarm && (
+          <>
+            <MassiveInput
+              innerRef={minutesRef}
+              onSubmitEditing={() => secondsRef.current?.focus()}
+              value={minutes}
+              onChangeText={setMinutes}
+              label="Rest minutes"
+              keyboardType="numeric"
+            />
+            <MassiveInput
+              innerRef={secondsRef}
+              value={seconds}
+              onChangeText={setSeconds}
+              label="Rest seconds"
+              keyboardType="numeric"
+              blurOnSubmit
+            />
+          </>
+        )}
         {!!settings.images && uri && (
           <TouchableRipple
             style={{marginBottom: MARGIN}}
diff --git a/WorkoutItem.tsx b/WorkoutItem.tsx
index 466ce50..5c8ccd5 100644
--- a/WorkoutItem.tsx
+++ b/WorkoutItem.tsx
@@ -1,5 +1,5 @@
 import {NavigationProp, useNavigation} from '@react-navigation/native';
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 import {GestureResponderEvent, Image} from 'react-native';
 import {List, Menu, Text} from 'react-native-paper';
 import ConfirmDialog from './ConfirmDialog';
@@ -35,15 +35,19 @@ export default function WorkoutItem({
     [setShowMenu, setAnchor],
   );
 
-  const minutes = item.minutes?.toString().padStart(2, '0');
-  const seconds = item.seconds?.toString().padStart(2, '0');
+  const description = useMemo(() => {
+    const minutes = item.minutes?.toString().padStart(2, '0');
+    const seconds = item.seconds?.toString().padStart(2, '0');
+    if (settings.alarm) return `${item.sets} sets ${minutes}:${seconds} rest`;
+    return `${item.sets} sets`;
+  }, [item, settings.alarm]);
 
   return (
     <>
       <List.Item
         onPress={() => navigation.navigate('EditWorkout', {value: item})}
         title={item.name}
-        description={`${item.sets} sets ${minutes}:${seconds} rest`}
+        description={description}
         onLongPress={longPress}
         left={() =>
           !!settings.images &&