diff --git a/src/plugins/python/weechat-python.c b/src/plugins/python/weechat-python.c
index 7bc3e9247..21fc0059d 100644
--- a/src/plugins/python/weechat-python.c
+++ b/src/plugins/python/weechat-python.c
@@ -1358,8 +1358,7 @@ weechat_python_infolist_constants ()
     return infolist;
 
 error:
-    if (infolist)
-        weechat_infolist_free (infolist);
+    weechat_infolist_free (infolist);
     return NULL;
 }
 
diff --git a/src/plugins/relay/irc/relay-irc.c b/src/plugins/relay/irc/relay-irc.c
index ddb8516a4..79847cd5a 100644
--- a/src/plugins/relay/irc/relay-irc.c
+++ b/src/plugins/relay/irc/relay-irc.c
@@ -561,8 +561,7 @@ relay_irc_signal_irc_outtags_cb (const void *pointer, void *data,
                                  (host && host[0]) ? host : "",
                                  ptr_message);
 
-                if (infolist_nick)
-                    weechat_infolist_free (infolist_nick);
+                weechat_infolist_free (infolist_nick);
             }
         }
         free (irc_channel);
diff --git a/tests/unit/core/test-core-infolist.cpp b/tests/unit/core/test-core-infolist.cpp
index 423a041e0..8347dff9f 100644
--- a/tests/unit/core/test-core-infolist.cpp
+++ b/tests/unit/core/test-core-infolist.cpp
@@ -253,6 +253,9 @@ TEST(CoreInfolist, Valid)
     infolist_free (infolist);
 
     LONGS_EQUAL(0, infolist_valid (infolist));
+
+    /* test free of NULL infolist */
+    infolist_free (NULL);
 }
 
 /*