diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile
index 7176995ec2..3edd526364 100644
--- a/package/libs/wolfssl/Makefile
+++ b/package/libs/wolfssl/Makefile
@@ -48,15 +48,6 @@ PKG_CONFIG_DEPENDS+=\
 	CONFIG_WOLFSSL_HAS_DEVCRYPTO_CBC \
 	CONFIG_WOLFSSL_HAS_DEVCRYPTO_FULL
 
-#
-# libwolfssl-benchmark should NOT be compiled as nonshared but
-# currently there is a bug where on buildbot stage2 the package
-# is recompiled to build libwolfssl-benchmark and the dependency
-# change to the new libwolfssl version. While this gets
-# investigated, set the nonshared flag global
-#
-PKGFLAGS:=nonshared
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libwolfssl/Default
@@ -69,6 +60,7 @@ endef
 define Package/libwolfssl
 $(call Package/libwolfssl/Default)
   TITLE:=wolfSSL library
+  PKGFLAGS:=nonshared
   MENU:=1
   PROVIDES:=libcyassl
   DEPENDS:=+WOLFSSL_HAS_DEVCRYPTO:kmod-cryptodev +WOLFSSL_HAS_AFALG:kmod-crypto-user