diff --git a/client/src/cmdhfwaveshare.c b/client/src/cmdhfwaveshare.c
index 0dc997556..2f4c835b4 100644
--- a/client/src/cmdhfwaveshare.c
+++ b/client/src/cmdhfwaveshare.c
@@ -674,15 +674,11 @@ static int CmdHF14AWSLoad(const char *Cmd) {
             return PM3_EMALLOC;
         }
     }
-
     gdImageDestroy(pal_img);
+
     int res = start_drawing(model_nr, black_plane, red_plane);
-
     free(black_plane);
-    if (red_plane) {
-        free(red_plane);
-    }
-
+    free(red_plane);
     return res;
 }
 
diff --git a/client/src/imgutils.c b/client/src/imgutils.c
index 67facd183..1ebcddbb6 100644
--- a/client/src/imgutils.c
+++ b/client/src/imgutils.c
@@ -53,7 +53,7 @@ gdImagePtr img_palettize(gdImagePtr rgb, int * palette, int palette_size) {
     }
 
     // Allocate space for palette in YCbCr
-    struct ycbcr_t * pal_ycbcr = malloc(palette_size * sizeof(struct ycbcr_t));
+    struct ycbcr_t * pal_ycbcr = calloc(palette_size, sizeof(struct ycbcr_t));
     if (!pal_ycbcr) {
         gdImageDestroy(res);
         return NULL;