diff --git a/lib/features/master_data/providers/ui/provider_form_screen.dart b/lib/features/master_data/providers/ui/provider_form_screen.dart
index a4e50c5..c7f713b 100644
--- a/lib/features/master_data/providers/ui/provider_form_screen.dart
+++ b/lib/features/master_data/providers/ui/provider_form_screen.dart
@@ -417,7 +417,7 @@ class _ProviderFormScreenState extends State<ProviderFormScreen> {
         BlocBuilder<ProviderFormCubit, ProviderFormState>(
           builder: (context, state) {
             // Se non ha un colore, usiamo il BlueGrey di default
-            final currentColorHex = state.provider?.colorHex ?? '#607D8B';
+            final currentColorHex = state.provider.colorHex ?? '#607D8B';
 
             return Wrap(
               spacing: 12,
diff --git a/lib/features/operations/ui/operation_list_screen.dart b/lib/features/operations/ui/operation_list_screen.dart
index 420563f..460e488 100644
--- a/lib/features/operations/ui/operation_list_screen.dart
+++ b/lib/features/operations/ui/operation_list_screen.dart
@@ -280,7 +280,9 @@ class _RichOperationCard extends StatelessWidget {
                       ),
                     Expanded(
                       child: Text(
-                        operation.reference ?? 'Senza Riferimento',
+                        operation.reference.isEmpty
+                            ? 'Nessuna Riferimento'
+                            : operation.reference,
                         style: theme.textTheme.labelSmall?.copyWith(
                           color: Colors.grey[600],
                         ),