diff --git a/src/utils/common.c b/src/utils/common.c
index 89eca1c..99ee067 100644
--- a/src/utils/common.c
+++ b/src/utils/common.c
@@ -374,8 +374,10 @@
 	os_memcpy(ssid_txt, ssid, ssid_len);
 	ssid_txt[ssid_len] = '\0';
 	for (pos = ssid_txt; *pos != '\0'; pos++) {
+#ifndef WPA_UNICODE_SSID
 		if ((u8) *pos < 32 || (u8) *pos >= 127)
 			*pos = '_';
+#endif
 	}
 	return ssid_txt;
 }