diff --git a/src/gui_version/utilities/cut_and_interpolate_gui.py b/src/gui_version/utilities/cut_and_interpolate_gui.py
index 608750ef11c61c1c2264d9c0bdeb63aeac001ce8..e63a33754740439c681ccaa437be2dc2590bfbf1 100644
--- a/src/gui_version/utilities/cut_and_interpolate_gui.py
+++ b/src/gui_version/utilities/cut_and_interpolate_gui.py
@@ -871,8 +871,8 @@ class cut_and_interpolate:
                 f_nan = interp2d(x, np.flip(y), nan_map, kind='linear')
                 nan_new = f_nan(x_new, y_new)
 
-            # Set all by nan values affected pixels to no data value
-            data_interp[nan_new > 0] = self.prop_settings['no_value']
+                # Set all by nan values affected pixels to no data value
+                data_interp[nan_new > 0] = self.prop_settings['no_value']
             
             return np.flipud(data_interp)
 
@@ -916,7 +916,9 @@ class cut_and_interpolate:
                     nan_interp[:, i] = f(y_new)
 
                     # Set all by nan values affected pixels to no data value
-                    data_interp[nan_interp > 0] = self.prop_settings['no_value']
+            
+            if self.prop_settings['no_value'] != None:
+                data_interp[nan_interp > 0] = self.prop_settings['no_value']
             
             return data_interp