diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index f03ae71d0c..84068339d2 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -48,9 +48,9 @@ define Package/libmbedtls/config
 config LIBMBEDTLS_HAVE_SSE2
 	depends on PACKAGE_libmbedtls
 	bool
-	default y if x86_64
+	default y if !TARGET_x86_legacy && !TARGET_x86_geode
 	prompt "Enable use of x86 SSE2 instructions"
-	depends on x86_64
+	depends on OPENSSL_WITH_ASM && x86_64 || i386
 	help
 		Use of SSE2 instructions greatly increase performance (up to
 		3x faster) with a minimum (~0.2%, or 23KB) increase in package