diff --git a/pages/cart/publishers/myschedule.tsx b/pages/cart/publishers/myschedule.tsx
index 97b66d0..952d9aa 100644
--- a/pages/cart/publishers/myschedule.tsx
+++ b/pages/cart/publishers/myschedule.tsx
@@ -60,7 +60,7 @@ export default function MySchedulePage({ assignments }) {
                 <div className="container ">
                     <h1 className="text-xl sm:text-2xl md:text-3xl font-bold text-center my-4">Моите смени</h1>
                     <div className="space-y-4">
-                        {assignments && assignments.map((assignment) => (
+                        {assignments && assignments.length > 0 ? (assignments.map((assignment) => (
                             <div key={assignment.dateStr + assignments.indexOf(assignment)} className="bg-white shadow overflow-hidden rounded-lg">
                                 <div className="px-4 py-5 sm:px-6">
                                     <h3 className="text-lg leading-6 font-medium text-gray-900">{assignment.dateStr}</h3>
@@ -117,7 +117,13 @@ export default function MySchedulePage({ assignments }) {
                                     </dl>
                                 </div>
                             </div>
-                        ))}
+                        ))) :
+                            <div className="bg-white shadow overflow-hidden rounded-lg">
+                                <div className="px-4 py-5 sm:px-6">
+                                    <h3 className="text-lg leading-6 font-medium text-gray-900">За сега нямате бъдещи назначени смени. Можете да проверите дали вашите възножности са актуални.</h3>
+                                </div>
+                            </div>
+                        }
                     </div>
                 </div>
                 <Modal isOpen={isModalOpen}