diff --git a/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu b/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
index 8c1c7ec9b8f6acd80b5ecaab57c43e0e41725e8b..663654d28f438ebd7e6c5970a2e96a9b3e3ba8eb 100644
--- a/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
+++ b/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
@@ -116,8 +116,12 @@ __global__ void update_baselines(float*  __restrict__ baseLineG0,
        NG1 += stats_G1[i];
     }
 
-    baseLineG0[0] = baseLineNG0[0] / NG0;
-    baseLineG1[0] = baseLineNG1[0] / NG1;
+    if (NG0 > 0)
+        baseLineG0[0] = baseLineNG0[0] / NG0;
+
+    if (NG1 > 0)
+        baseLineG1[0] = baseLineNG1[0] / NG1;
+
     baseLineNG0[0] = 0;
     baseLineNG1[0] = 0;
 }