diff --git a/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx b/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx
index e39ca10d..70db6293 100644
--- a/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx
+++ b/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx
@@ -292,7 +292,7 @@ const RatecardDrawer = ({
     if (
       drawerRatecard &&
       (drawerRatecard.jobRolesList?.length === 0 || !drawerRatecard.jobRolesList) &&
-      name === 'Untitled Rate Card'
+      (name === 'Untitled Rate Card' || name === '' || name === undefined)
     ) {
       await dispatch(deleteRateCard(drawerRatecard.id as string));
     }
@@ -344,7 +344,7 @@ const RatecardDrawer = ({
       width={700}
       footer={
         <Flex justify="end" gap={16} style={{ marginTop: 16 }}>
-          <Button style={{ marginBottom: 24 }} onClick={handleSave} type="primary">{t('saveButton')}</Button>
+          <Button style={{ marginBottom: 24 }} onClick={handleSave} type="primary" disabled={name === '' || name === 'Untitled Rate Card' && roles.length ===0}>{t('saveButton')}</Button>
         </Flex>
       }
     >
diff --git a/worklenz-frontend/src/pages/settings/ratecard/ratecard-settings.tsx b/worklenz-frontend/src/pages/settings/ratecard/ratecard-settings.tsx
index 4e149e84..d236e91a 100644
--- a/worklenz-frontend/src/pages/settings/ratecard/ratecard-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/ratecard/ratecard-settings.tsx
@@ -87,7 +87,7 @@ const RatecardSettings: React.FC = () => {
 
   useEffect(() => {
     fetchRateCards();
-  }, [toggleRatecardDrawer]);
+  }, [toggleRatecardDrawer, dispatch]);