diff --git a/lib/pages/access_management/manage_bookable_spaces/presentation/widgets/space_step_part_widget.dart b/lib/pages/access_management/manage_bookable_spaces/presentation/widgets/space_step_part_widget.dart
index 953ec1f6..60ba2441 100644
--- a/lib/pages/access_management/manage_bookable_spaces/presentation/widgets/space_step_part_widget.dart
+++ b/lib/pages/access_management/manage_bookable_spaces/presentation/widgets/space_step_part_widget.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/manage_bookable_spaces/domain/params/non_bookable_spaces_params.dart';
@@ -123,15 +121,13 @@ class _SpacesStepDetailsWidgetState extends State<SpacesStepDetailsWidget> {
                     }
                   },
                   builder: (context, state) {
-                    if (state is NonBookableSpacesError) {
-                      return Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Text(state.error),
-                          const SizedBox(
-                            height: 5,
-                          ),
-                          ElevatedButton(
+                    return switch (state) {
+                      NonBookableSpacesError(error: final error) => Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Text(error),
+                            const SizedBox(height: 5),
+                            ElevatedButton(
                               onPressed: () {
                                 context.read<NonBookableSpacesBloc>().add(
                                       LoadUnBookableSpacesEvent(
@@ -143,28 +139,28 @@ class _SpacesStepDetailsWidgetState extends State<SpacesStepDetailsWidget> {
                                       ),
                                     );
                               },
-                              child: const Text('Try Again'))
-                        ],
-                      );
-                    } else if (state is NonBookableSpacesLoading) {
-                      if (state.lastNonBookableSpaces == null) {
-                        return const Center(
-                          child: CircularProgressIndicator(),
-                        );
-                      } else {
-                        return UnbookableListWidget(
+                              child: const Text('Try Again'),
+                            ),
+                          ],
+                        ),
+                      NonBookableSpacesLoading(lastNonBookableSpaces: null) =>
+                        const Center(child: CircularProgressIndicator()),
+                      NonBookableSpacesLoading(
+                        lastNonBookableSpaces: final spaces
+                      ) =>
+                        UnbookableListWidget(
                           scrollController: scrollController,
-                          nonBookableSpaces: state.lastNonBookableSpaces!,
-                        );
-                      }
-                    } else if (state is NonBookableSpacesLoaded) {
-                      return UnbookableListWidget(
-                        scrollController: scrollController,
-                        nonBookableSpaces: state.nonBookableSpaces,
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
+                          nonBookableSpaces: spaces!,
+                        ),
+                      NonBookableSpacesLoaded(
+                        nonBookableSpaces: final spaces
+                      ) =>
+                        UnbookableListWidget(
+                          scrollController: scrollController,
+                          nonBookableSpaces: spaces,
+                        ),
+                      _ => const SizedBox(),
+                    };
                   },
                 ),
               )