diff --git a/apps/app/components/estimates/estimate-points-modal.tsx b/apps/app/components/estimates/estimate-points-modal.tsx
index f478f0a5b..b14c33c03 100644
--- a/apps/app/components/estimates/estimate-points-modal.tsx
+++ b/apps/app/components/estimates/estimate-points-modal.tsx
@@ -337,7 +337,7 @@ export const EstimatePointsModal: React.FC<Props> = ({ isOpen, data, estimate, o
                   <div className="mt-5 flex justify-end gap-2">
                     <SecondaryButton onClick={() => handleClose()}>Cancel</SecondaryButton>
                     <PrimaryButton type="submit" loading={isSubmitting}>
-                      {data
+                      {data && data.length > 0
                         ? isSubmitting
                           ? "Updating Points..."
                           : "Update Points"
diff --git a/apps/app/components/estimates/single-estimate.tsx b/apps/app/components/estimates/single-estimate.tsx
index f65002937..1d626f5fd 100644
--- a/apps/app/components/estimates/single-estimate.tsx
+++ b/apps/app/components/estimates/single-estimate.tsx
@@ -107,14 +107,16 @@ export const SingleEstimate: React.FC<Props> = ({
             </p>
           </div>
           <CustomMenu ellipsis>
-            {projectDetails?.estimate !== estimate.id && (
-              <CustomMenu.MenuItem onClick={handleUseEstimate}>
-                <div className="flex items-center justify-start gap-2">
-                  <SquaresPlusIcon className="h-3.5 w-3.5" />
-                  <span>Use estimate</span>
-                </div>
-              </CustomMenu.MenuItem>
-            )}
+            {projectDetails?.estimate !== estimate.id &&
+              estimatePoints &&
+              estimatePoints.length > 0 && (
+                <CustomMenu.MenuItem onClick={handleUseEstimate}>
+                  <div className="flex items-center justify-start gap-2">
+                    <SquaresPlusIcon className="h-3.5 w-3.5" />
+                    <span>Use estimate</span>
+                  </div>
+                </CustomMenu.MenuItem>
+              )}
             <CustomMenu.MenuItem onClick={() => setIsEstimatePointsModalOpen(true)}>
               <div className="flex items-center justify-start gap-2">
                 <ListBulletIcon className="h-3.5 w-3.5" />