diff --git a/Caps/Camera/CameraView.swift b/Caps/Camera/CameraView.swift
index 27aef8e..51ef2fe 100644
--- a/Caps/Camera/CameraView.swift
+++ b/Caps/Camera/CameraView.swift
@@ -112,6 +112,7 @@ struct CameraView: View {
 
     private func dismiss() {
         isPresented = false
+        self.capId = nil
     }
 
     private func capture() {
diff --git a/Caps/ContentView.swift b/Caps/ContentView.swift
index f5bcc00..b821ce6 100644
--- a/Caps/ContentView.swift
+++ b/Caps/ContentView.swift
@@ -319,6 +319,7 @@ struct ContentView: View {
         }
         database.save(image, for: cap.id)
         database.image = nil
+        capIdOfNextPhoto = nil
     }
 
     private func saveNewCap() {