diff --git a/src/sort.c b/src/sort.c
index 474a3cf6434329fe786542b888f9c442469a2a0b..f813ff26b16894556b789774015c7f11a3956f6e 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -264,16 +264,13 @@ void sortCommand(redisClient *c) {
         j++;
     }
 
-    /* For the STORE option, or when SORT is called from a Lua script,
-     * we want to force a specific ordering even when no explicit ordering
-     * was asked (SORT BY nosort). This guarantees that replication / AOF
-     * is deterministic.
+    /* When sorting a set with no sort specified, we must sort the output
+     * so the result is consistent across scripting and replication.
      *
-     * However in the case 'dontsort' is true, but the type to sort is a
-     * sorted set, we don't need to do anything as ordering is guaranteed
-     * in this special case. */
-    if ((storekey || c->flags & REDIS_LUA_CLIENT) &&
-        (dontsort && sortval->type != REDIS_ZSET))
+     * The other types (list, sorted set) will retain their native order
+     * even if no sort order is requested, so they remain stable across
+     * scripting and replication. */
+    if ((dontsort && sortval->type == REDIS_SET))
     {
         /* Force ALPHA sorting */
         dontsort = 0;
diff --git a/tests/unit/sort.tcl b/tests/unit/sort.tcl
index 9903a183fbe0d2085f7d5d5e539fbb67cefca4ad..a25ffeb5ce76f68d3b2fde76f40d8b3582e23823 100644
--- a/tests/unit/sort.tcl
+++ b/tests/unit/sort.tcl
@@ -238,6 +238,24 @@ start_server {
         r sort mylist by num get x:*->
     } {100}
 
+    test "SORT by nosort retains native order for lists" {
+        r del testa
+        r lpush testa 2 1 4 3 5
+        r sort testa by nosort
+    } {5 3 4 1 2}
+
+    test "SORT by nosort plus store retains native order for lists" {
+        r del testa
+        r lpush testa 2 1 4 3 5
+        r sort testa by nosort store testb
+        r lrange testb 0 -1
+    } {5 3 4 1 2}
+
+    test "SORT by nosort with limit returns based on original list order" {
+        r sort testa by nosort limit 0 3 store testb
+        r lrange testb 0 -1
+    } {5 3 4}
+
     tags {"slow"} {
         set num 100
         set res [create_random_dataset $num lpush]