diff --git a/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp b/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp
index 8805154a6c7..106901aad8b 100644
--- a/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp
+++ b/src/common/dsp/effects/airwindows/AirWindowsEffect.cpp
@@ -185,11 +185,7 @@ void AirWindowsEffect::process(float *dataL, float *dataR)
         hasInvalidated = true;
     }
 
-    // Once we are setup, an fx type of 0 is just an init cycle mistake
-    if (*(pdata_ival[0]) == 0 && fxdata->p[0].user_data)
-        return;
-
-    if (!airwin || *(pdata_ival[0]) != lastSelected || fxdata->p[0].user_data == nullptr)
+    if (!airwin || fxdata->p[0].val.i != lastSelected || fxdata->p[0].user_data == nullptr)
     {
         /*
         ** So do we want to let Airwindows set params as defaults or do we want
@@ -207,7 +203,7 @@ void AirWindowsEffect::process(float *dataL, float *dataR)
         {
             useStreamedValues = true;
         }
-        setupSubFX(*(pdata_ival[0]), useStreamedValues);
+        setupSubFX(fxdata->p[0].val.i, useStreamedValues);
     }
 
     if (!airwin)