diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index a069db499..10fc300cb 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -782,6 +782,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
         containerView.addSubview(mediaMessageView)
         mediaMessageView.autoPinEdgesToSuperviewEdges()
 
+        #if DEBUG
         if let imageEditorModel = attachmentItem.imageEditorModel {
 
             let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self)
@@ -797,6 +798,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
                                             viewController: self)
             }
         }
+        #endif
 
         if isZoomable {
             // Add top and bottom gradients to ensure toolbar controls are legible
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift
index f99ccde46..cd7272096 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift
@@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject {
 
     @objc
     public static var isFeatureEnabled: Bool {
-        return true
+        return _isDebugAssertConfiguration()
     }
 
     @objc