diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index fea0dfe4f..6e3335e44 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -97,8 +97,8 @@
 #define HAVE_ERR_REMOVE_THREAD_STATE 1
 #if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
   !defined(LIBRESSL_VERSION_NUMBER)
-/* OpenSSL 1.1.0-pre4 removed the argument! */
-#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
+/* OpenSSL 1.1.0 deprecates the function */
+#define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
 #endif
 #endif
 
@@ -737,8 +737,8 @@ void Curl_ossl_cleanup(void)
   ERR_free_strings();
 
   /* Free thread local error state, destroying hash upon zero refcount */
-#ifdef HAVE_ERR_REMOVE_THREAD_STATE_NOARG
-  ERR_remove_thread_state();
+#ifdef HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED
+
 #elif defined(HAVE_ERR_REMOVE_THREAD_STATE)
   ERR_remove_thread_state(NULL);
 #else