diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
index 9e9001f553..585d6d5a11 100644
--- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
+++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
@@ -453,12 +453,15 @@ class PhotoCaptureViewController: OWSViewController, InteractiveDismissDelegate
     }
 
     func updateDoneButtonAppearance () {
-        if isInBatchMode, let badgeNumber = dataSource?.numberOfMediaItems {
+        if isInBatchMode, let badgeNumber = dataSource?.numberOfMediaItems, badgeNumber > 0 {
             doneButton.badgeNumber = badgeNumber
             doneButton.isHidden = false
         } else {
             doneButton.isHidden = true
         }
+        if bottomBar.isCompactHeightLayout {
+            bottomBar.switchCameraButton.isHidden = !doneButton.isHidden
+        }
     }
 
     // MARK: - Interactive Dismiss