diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 626e74e89cb111c345089a716615a143a6d59340..656296062bb87c1e42a22a84c3506380a101875c 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -751,11 +751,14 @@ def run_qc(filename, filename_l1b, day_night='ANY', pass_thresh_frac=0.20, icing
 
 
 def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mask, bt_11um, solzen, satzen, day_night='ANY'):
-    opd_thick_threshold = 2
-    opd_thin_threshold = 0.1
+
     if day_night == 'DAY':
         opd_thick_threshold = 20
         opd_thin_threshold = 1
+    elif day_night == 'NIGHT' or day_night == 'ANY':
+        opd_thick_threshold = 2
+        opd_thin_threshold = 0.1
+
     closeness = 100.0  # meters
     num_obs = len(icing_alt)
     cld_mask = cld_mask.reshape((num_obs, -1))
@@ -774,6 +777,9 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mask,
             continue
         elif day_night == 'DAY' and not is_day(solzen[i,]):
             continue
+        elif day_night == 'ANY':
+            if not (is_day(solzen[i,]) or is_night(solzen[i,])):
+                continue
 
         keep_0 = np.logical_or(cld_mask[i,] == 2, cld_mask[i,] == 3)  # cloudy
         keep_1 = np.invert(np.isnan(cld_top_hgt[i,]))