diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index cc2c5a6ec7..dafc4bf838 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -3463,7 +3463,7 @@ def get_filenames_without_hash(filename, frame_start, frame_end):
         frame_end (str): end of the frame
 
     Returns:
-        filenames(list): list of filename
+        list: filename per frame of the sequence
     """
     filenames = []
     for frame in range(int(frame_start), (int(frame_end) + 1)):
diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py
index 348a0b5d76..e16aef6740 100644
--- a/openpype/hosts/nuke/api/plugin.py
+++ b/openpype/hosts/nuke/api/plugin.py
@@ -818,9 +818,13 @@ class ExporterReviewMov(ExporterReview):
 
         self.file = self.fhead + self.name + ".{}".format(self.ext)
         if ".{}".format(self.ext) not in VIDEO_EXTENSIONS:
+            # filename would be with frame hashes if
+            # the file extension is not in video format
             filename = get_head_filename_without_hashes(
                 self.path_in, self.name)
             self.file = filename
+            # make sure the filename are in
+            # correct image output format
             if ".{}".format(self.ext) not in self.file:
                 original_ext = os.path.splitext(filename)[-1].strip(".")    # noqa
                 self.file = filename.replace(original_ext, ext)
diff --git a/openpype/hosts/nuke/plugins/publish/extract_review_baking_streams.py b/openpype/hosts/nuke/plugins/publish/extract_review_baking_streams.py
index d9ae673c2c..fe468bd263 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_review_baking_streams.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_review_baking_streams.py
@@ -33,13 +33,13 @@ class ExtractReviewDataBakingStreams(publish.Extractor):
         nuke_publish = project_settings["nuke"]["publish"]
         deprecated_setting = nuke_publish["ExtractReviewDataMov"]
         current_setting = nuke_publish["ExtractReviewDataBakingStreams"]
-        if not deprecated_setting["enabled"]:
-            if current_setting["enabled"]:
-                cls.viewer_lut_raw = current_setting["viewer_lut_raw"]
-                cls.outputs = current_setting["outputs"]
-        else:
+        if deprecated_setting["enabled"]:
+            # Use deprecated settings if they are still enabled
             cls.viewer_lut_raw = deprecated_setting["viewer_lut_raw"]
             cls.outputs = deprecated_setting["outputs"]
+        elif current_setting["enabled"]:
+            cls.viewer_lut_raw = current_setting["viewer_lut_raw"]
+            cls.outputs = current_setting["outputs"]
 
     def process(self, instance):
         families = set(instance.data["families"])
diff --git a/openpype/settings/ayon_settings.py b/openpype/settings/ayon_settings.py
index b43e0b7c5f..dc6e9fab12 100644
--- a/openpype/settings/ayon_settings.py
+++ b/openpype/settings/ayon_settings.py
@@ -754,11 +754,10 @@ def _convert_nuke_project_settings(ayon_settings, output):
     current_review_settings = (
         ayon_publish["ExtractReviewDataBakingStreams"]
     )
-    if not deprecrated_review_settings["enabled"]:
-        if current_review_settings["enabled"]:
-            outputs_settings = current_review_settings["outputs"]
-    else:
+    if deprecrated_review_settings["enabled"]:
         outputs_settings = deprecrated_review_settings["outputs"]
+    elif current_review_settings["enabled"]:
+        outputs_settings = current_review_settings["outputs"]
 
     for item in outputs_settings:
         item_filter = item["filter"]
@@ -780,12 +779,10 @@ def _convert_nuke_project_settings(ayon_settings, output):
         name = item.pop("name")
         new_review_data_outputs[name] = item
 
-    if deprecrated_review_settings["outputs"] == (
-        current_review_settings["outputs"]
-    ):
-        current_review_settings["outputs"] = new_review_data_outputs
-    else:
+    if deprecrated_review_settings["enabled"]:
         deprecrated_review_settings["outputs"] = new_review_data_outputs
+    elif current_review_settings["enabled"]:
+        current_review_settings["outputs"] = new_review_data_outputs
 
     collect_instance_data = ayon_publish["CollectInstanceData"]
     if "sync_workfile_version_on_product_types" in collect_instance_data: