diff --git a/src/java/org/apache/cassandra/concurrent/SEPWorker.java b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
index 01a8db45ee5a..3dbc1543cea7 100644
--- a/src/java/org/apache/cassandra/concurrent/SEPWorker.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
@@ -52,6 +52,8 @@ final class SEPWorker extends AtomicReference<SEPWorker.Work> implements Runnabl
 
     private final AtomicReference<Runnable> currentTask = new AtomicReference<>();
 
+    private String lastUsedExecutorName;
+
     SEPWorker(ThreadGroup threadGroup, Long workerId, Work initialState, SharedExecutorPool pool)
     {
         this.pool = pool;
@@ -128,8 +130,11 @@ public void run()
                 assigned = get().assigned;
                 if (assigned == null)
                     continue;
-                if (SET_THREAD_NAME)
+                if (SET_THREAD_NAME && assigned.name != lastUsedExecutorName) // .equals is not used intentionally
+                {
                     Thread.currentThread().setName(assigned.name + workerIdThreadSuffix);
+                    lastUsedExecutorName = assigned.name;
+                }
 
                 task = assigned.tasks.poll();
                 currentTask.lazySet(task);
diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index 99726f6b3ddb..3b3b3f2dfed0 100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -519,7 +519,7 @@ public enum CassandraRelevantProperties
      */
     SEED_COUNT_WARN_THRESHOLD("cassandra.seed_count_warn_threshold"),
     SERIALIZATION_EMPTY_TYPE_NONEMPTY_BEHAVIOR("cassandra.serialization.emptytype.nonempty_behavior"),
-    SET_SEP_THREAD_NAME("cassandra.set_sep_thread_name", "true"),
+    SET_SEP_THREAD_NAME("cassandra.set_sep_thread_name", "false"),
     SHUTDOWN_ANNOUNCE_DELAY_IN_MS("cassandra.shutdown_announce_in_ms", "2000"),
     SIMULATOR_SEED("cassandra.simulator.seed"),
     SIMULATOR_STARTED("cassandra.simulator.started"),