diff --git a/src/utils/hsdis/binutils/hsdis-binutils.c b/src/utils/hsdis/binutils/hsdis-binutils.c
index 86d49964f90e6..3500b46f464a5 100644
--- a/src/utils/hsdis/binutils/hsdis-binutils.c
+++ b/src/utils/hsdis/binutils/hsdis-binutils.c
@@ -336,8 +336,8 @@ static void setup_app_data(struct hsdis_app_data* app_data,
                                  app_data->printf_stream,
                                  app_data->printf_callback,
                                  native_bfd,
-                                 /* On PowerPC we get warnings, if we pass empty options */
-                                 (caller_options == NULL) ? NULL : app_data->insn_options);
+                                 /* On some archs we get warnings, if we pass empty options */
+                                 (app_data->insn_options[0] == '\0') ? NULL : app_data->insn_options);
 
   /* Finish linking together the various callback blocks. */
   app_data->dinfo.application_data = (void*) app_data;