diff --git a/client/ayon_photoshop/api/extension.zxp b/client/ayon_photoshop/api/extension.zxp
index 44a81bff..7ec603c3 100644
Binary files a/client/ayon_photoshop/api/extension.zxp and b/client/ayon_photoshop/api/extension.zxp differ
diff --git a/client/ayon_photoshop/api/extension/CSXS/manifest.xml b/client/ayon_photoshop/api/extension/CSXS/manifest.xml
index 3a5f3329..b69fe707 100644
--- a/client/ayon_photoshop/api/extension/CSXS/manifest.xml
+++ b/client/ayon_photoshop/api/extension/CSXS/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<ExtensionManifest ExtensionBundleId="io.ynput.PS.panel" ExtensionBundleVersion="1.1.17" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ExtensionManifest ExtensionBundleId="io.ynput.PS.panel" ExtensionBundleVersion="1.1.18" Version="7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ExtensionList>
     <Extension Id="io.ynput.PS.panel" />
   </ExtensionList>
diff --git a/client/ayon_photoshop/api/extension/host/index.jsx b/client/ayon_photoshop/api/extension/host/index.jsx
index 6382c623..6f947c17 100644
--- a/client/ayon_photoshop/api/extension/host/index.jsx
+++ b/client/ayon_photoshop/api/extension/host/index.jsx
@@ -329,16 +329,13 @@ function saveAs(output_path, ext, as_copy){
             is_temp_doc = true;
             doc.bitsPerChannel = BitsPerChannelType.EIGHT;
         }
-        if (
-          doc.bitsPerChannel === BitsPerChannelType.SIXTEEN ||
-          doc.bitsPerChannel === BitsPerChannelType.EIGHT
-          && (ext === 'exr')
-        ) {
+        if (ext === 'exr'){
             // Create a temp duplicate of the document to enforce 32 bit
             // document, because EXR save is only supported from 32 bit
             doc = doc.duplicate();
             is_temp_doc = true;
             doc.bitsPerChannel = BitsPerChannelType.THIRTYTWO;
+            doc.flatten();
         }
         if (ext === 'jpg') {
             saveOptions = new JPEGSaveOptions();