diff --git a/lib/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart b/lib/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart
index 0bd347ab..525e79c9 100644
--- a/lib/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart
+++ b/lib/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart
@@ -26,8 +26,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
         Table(
           border: TableBorder.all(
             color: ColorsManager.graysColor,
-            borderRadius: const BorderRadius.only(
-                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+            borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
           ),
           children: [
             TableRow(
@@ -56,16 +55,15 @@ class ScheduleGarageTableWidget extends StatelessWidget {
                   child: Center(child: CircularProgressIndicator()));
             }
             if (state is GarageDoorLoadedState &&
-                state.status.schedules?.isEmpty == true) {
+                state.status.schedules!.isEmpty) {
               return _buildEmptyState(context);
             } else if (state is GarageDoorLoadedState) {
               return Container(
                   height: 200,
                   decoration: BoxDecoration(
                     border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius: const BorderRadius.only(
-                        bottomLeft: Radius.circular(20),
-                        bottomRight: Radius.circular(20)),
+                    borderRadius: const BorderRadius.vertical(
+                        bottom: Radius.circular(20)),
                   ),
                   child: _buildTableBody(state, context));
             }
@@ -83,8 +81,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
       height: 200,
       decoration: BoxDecoration(
         border: Border.all(color: ColorsManager.graysColor),
-        borderRadius: const BorderRadius.only(
-            bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
+        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
       ),
       child: Center(
         child: Column(