diff --git a/src/components/History/JobsCompleted.jsx b/src/components/History/JobsCompleted.jsx
index c70293e..2aef7ad 100644
--- a/src/components/History/JobsCompleted.jsx
+++ b/src/components/History/JobsCompleted.jsx
@@ -53,7 +53,7 @@ function JobsCompleted() {
     <div className='flex flex-col justify-between min-h-[500px]'>
     {jobHistory.loading ? 
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
-    : jobHistory.data.length ?
+    : jobHistory?.data?.length ?
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='w-full'>
             <tr className='text-slate-600 dark:text-white'>
diff --git a/src/components/MarketPlace/PopUp/MarketPopUp.jsx b/src/components/MarketPlace/PopUp/MarketPopUp.jsx
index be1036b..1a019dc 100644
--- a/src/components/MarketPlace/PopUp/MarketPopUp.jsx
+++ b/src/components/MarketPlace/PopUp/MarketPopUp.jsx
@@ -175,8 +175,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                   <div
                     className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop ${
                       name == "Description"
-                        ? "max-h-28 h-full overflow-y-auto break-words"
-                        : name == "Delivery Detail" ? " overflow-y-auto h-full max-h-28"
+                        ? "max-h-22 h-full overflow-y-auto break-words"
+                        : name == "Delivery Detail" ? " overflow-y-auto h-full max-h-22"
                         : "h-full flex items-center"
                     }`}
                   >