diff --git a/src/server.c b/src/server.c
index fa2c7b1ee..8e99431f9 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2865,6 +2865,14 @@ void initServer(void) {
     scriptingInit(1);
     slowlogInit();
     latencyMonitorInit();
+}
+
+/* Some steps in server initialization need to be done last (after modules
+ * are loaded).
+ * Specifically, creation of threads due to a race bug in ld.so, in which
+ * Thread Local Storage initialization collides with dlopen call.
+ * see: https://sourceware.org/bugzilla/show_bug.cgi?id=19329 */
+void InitServerLast() {
     bioInit();
     initThreadedIO();
     set_jemalloc_bg_thread(server.jemalloc_bg_thread);
@@ -4876,6 +4884,7 @@ int main(int argc, char **argv) {
     #endif
         moduleLoadFromQueue();
         ACLLoadUsersAtStartup();
+        InitServerLast();
         loadDataFromDisk();
         if (server.cluster_enabled) {
             if (verifyClusterConfigWithData() == C_ERR) {
@@ -4890,6 +4899,7 @@ int main(int argc, char **argv) {
         if (server.sofd > 0)
             serverLog(LL_NOTICE,"The server is now ready to accept connections at %s", server.unixsocket);
     } else {
+        InitServerLast();
         sentinelIsRunning();
     }
 
diff --git a/src/zmalloc.c b/src/zmalloc.c
index 58896a727..437f43b64 100644
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -332,10 +332,8 @@ int zmalloc_get_allocator_info(size_t *allocated,
 void set_jemalloc_bg_thread(int enable) {
     /* let jemalloc do purging asynchronously, required when there's no traffic 
      * after flushdb */
-    if (enable) {
-        char val = 1;
-        je_mallctl("background_thread", NULL, 0, &val, 1);
-    }
+    char val = !!enable;
+    je_mallctl("background_thread", NULL, 0, &val, 1);
 }
 
 int jemalloc_purge() {