diff --git a/libaf/af_surround.c b/libaf/af_surround.c
index 4b1cb9dac2..b03d0d1a2d 100644
--- a/libaf/af_surround.c
+++ b/libaf/af_surround.c
@@ -150,12 +150,10 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
 // Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
-  if(af->data->audio)
-    free(af->data->audio);
   if(af->data)
-    free(af->data);
-  if(af->setup)
-    free(af->setup);
+    free(af->data->audio);
+  free(af->data);
+  free(af->setup);
 }
 
 // The beginnings of an active matrix...