diff --git a/redis.conf b/redis.conf
index 356dbcca8..2519f47e2 100644
--- a/redis.conf
+++ b/redis.conf
@@ -1503,3 +1503,7 @@ rdb-save-incremental-fsync yes
 # of your network hardware, not the number of cores on your machine.  We don't recommend going
 # above 4 at this time.  By default this is set 1.
 server-threads 2
+
+# Should KeyDB pin threads to CPUs? By default this is disabled, and KeyDB will not bind threads.
+# When enabled threads are bount to cores sequentially starting at core 0.
+# server-thread-affinity true
diff --git a/src/config.c b/src/config.c
index 59ae23303..883f09cea 100644
--- a/src/config.c
+++ b/src/config.c
@@ -836,6 +836,15 @@ void loadServerConfigFromString(char *config) {
                 err = "Invalid number of threads specified";
                 goto loaderr;
             }
+        } else if (!strcasecmp(argv[0],"server-thread-affinity") && argc == 2) {
+            if (strcasecmp(argv[1], "true") == 0) {
+                server.fThreadAffinity = TRUE;
+            } else if (strcasecmp(argv[1], "false") == 0) {
+                server.fThreadAffinity = FALSE;
+            } else {
+                err = "Unknown argument: server-thread-affinity expects either true or false";
+                goto loaderr;
+            }
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }
diff --git a/src/networking.cpp b/src/networking.cpp
index 244a83335..58797765b 100644
--- a/src/networking.cpp
+++ b/src/networking.cpp
@@ -1034,6 +1034,17 @@ static void acceptCommonHandler(int fd, int flags, char *ip, int iel) {
         close(fd); /* May be already closed, just ignore errors */
         return;
     }
+
+    // Set thread affinity
+    if (server.fThreadAffinity)
+    {
+        int cpu = iel;
+        if (setsockopt(fd, SOL_SOCKET, SO_INCOMING_CPU, &cpu, sizeof(iel)) != 0)
+        {
+            serverLog(LL_WARNING, "Failed to set socket affinity");
+        }
+    }
+
     /* If maxclient directive is set and this is one client more... close the
      * connection. Note that we create the client instead to check before
      * for this condition, since now the socket is already set in non-blocking
diff --git a/src/server.c b/src/server.c
index 74c9d79c9..3eb0cb97f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2460,6 +2460,7 @@ void initServerConfig(void) {
 
     /* Multithreading */
     server.cthreads = CONFIG_DEFAULT_THREADS;
+    server.fThreadAffinity = CONFIG_DEFAULT_THREAD_AFFINITY;
 }
 
 extern char **environ;
@@ -5086,11 +5087,22 @@ int main(int argc, char **argv) {
 
     serverAssert(server.cthreads > 0 && server.cthreads <= MAX_EVENT_LOOPS);
     pthread_t rgthread[MAX_EVENT_LOOPS];
-    for (int iel = 1; iel < server.cthreads; ++iel)
+    for (int iel = 0; iel < server.cthreads; ++iel)
     {
         pthread_create(rgthread + iel, NULL, workerThreadMain, (void*)((int64_t)iel));
+        if (server.fThreadAffinity)
+        {
+            cpu_set_t cpuset;
+            CPU_ZERO(&cpuset);
+            CPU_SET(iel, &cpuset);
+            if (pthread_setaffinity_np(rgthread[iel], sizeof(cpu_set_t), &cpuset) == 0)
+            {
+                serverLog(LOG_INFO, "Binding thread %d to cpu %d", iel, iel);
+            }
+        }
     }
-    workerThreadMain((void*)((int64_t)IDX_EVENT_LOOP_MAIN));
+    void *pvRet;
+    pthread_join(rgthread[IDX_EVENT_LOOP_MAIN], &pvRet);
     return 0;
 }
 
diff --git a/src/server.h b/src/server.h
index cb0977585..35a6df57a 100644
--- a/src/server.h
+++ b/src/server.h
@@ -183,6 +183,7 @@ extern "C" {
 #define CONFIG_DEFAULT_PROTO_MAX_BULK_LEN (512ll*1024*1024) /* Bulk request max size */
 
 #define CONFIG_DEFAULT_THREADS 1
+#define CONFIG_DEFAULT_THREAD_AFFINITY 0
 
 #define ACTIVE_EXPIRE_CYCLE_LOOKUPS_PER_LOOP 20 /* Loopkups per loop. */
 #define ACTIVE_EXPIRE_CYCLE_FAST_DURATION 1000 /* Microseconds */
@@ -1070,6 +1071,7 @@ struct redisServer {
     dict *orig_commands;        /* Command table before command renaming. */
 
     int cthreads;               /* Number of main worker threads */
+    int fThreadAffinity;        /* Should we pin threads to cores? */
     struct redisServerThreadVars rgthreadvar[MAX_EVENT_LOOPS];
 
     unsigned int lruclock;      /* Clock for LRU eviction */