diff --git a/lib/providers/logbook_photos_provider.dart b/lib/providers/logbook_photos_provider.dart
index b26a107..bcefdd1 100644
--- a/lib/providers/logbook_photos_provider.dart
+++ b/lib/providers/logbook_photos_provider.dart
@@ -83,7 +83,7 @@ class LogbookPhotosProviderState extends State<LogbookPhotosProvider> {
         nd: nd,
         coordinates: coordinates,
       );
-      //await widget.storageService.addPhoto(photo);
+      await widget.storageService.addPhoto(photo);
       _photos[photo.id] = photo;
       setState(() {});
     } else {
diff --git a/lib/screens/logbook_photo_edit/bloc_logbook_photo_edit.dart b/lib/screens/logbook_photo_edit/bloc_logbook_photo_edit.dart
index ee08e3c..50006c8 100644
--- a/lib/screens/logbook_photo_edit/bloc_logbook_photo_edit.dart
+++ b/lib/screens/logbook_photo_edit/bloc_logbook_photo_edit.dart
@@ -23,6 +23,8 @@ class LogbookPhotoEditBloc extends Bloc<LogbookPhotoEditEvent, LogbookPhotoEditS
             iso: photo.iso,
             nd: photo.nd,
             coordinates: photo.coordinates,
+            aperture: photo.apertureValue,
+            shutterSpeed: photo.shutterSpeedValue,
             note: photo.note,
             canSave: false,
           ),
@@ -46,7 +48,7 @@ class LogbookPhotoEditBloc extends Bloc<LogbookPhotoEditEvent, LogbookPhotoEditS
   }
 
   Future<void> _onApertureChanged(LogbookPhotoApertureChangedEvent event, Emitter emit) async {
-    _newPhoto = _newPhoto.copyWith(apertureValue: event.aperture);
+    _newPhoto = _newPhoto.copyWith(apertureValue: Optional(event.aperture));
     emit(
       state.copyWith(
         aperture: event.aperture,
@@ -56,7 +58,7 @@ class LogbookPhotoEditBloc extends Bloc<LogbookPhotoEditEvent, LogbookPhotoEditS
   }
 
   Future<void> _onShutterSpeedChanged(LogbookPhotoShutterSpeedChangedEvent event, Emitter emit) async {
-    _newPhoto = _newPhoto.copyWith(shutterSpeedValue: event.shutterSpeed);
+    _newPhoto = _newPhoto.copyWith(shutterSpeedValue: Optional(event.shutterSpeed));
     emit(
       state.copyWith(
         shutterSpeed: event.shutterSpeed,