diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
index 954ebff61d..1dc6bcfaca 100644
--- a/src/detect-engine-address.c
+++ b/src/detect-engine-address.c
@@ -1290,14 +1290,10 @@ int DetectAddressTestConfVars(void)
             goto error;
         }
 
-        if (gh != NULL) {
-            DetectAddressHeadFree(gh);
-            gh = NULL;
-        }
-        if (ghn != NULL) {
-            DetectAddressHeadFree(ghn);
-            ghn = NULL;
-        }
+        DetectAddressHeadFree(gh);
+        gh = NULL;
+        DetectAddressHeadFree(ghn);
+        ghn = NULL;
     }
 
     return 0;