diff --git a/src/server.c b/src/server.c
index 0f63bcb02..6979d0981 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3275,6 +3275,13 @@ void slowlogPushCurrentCommand(client *c, struct serverCommand *cmd, ustime_t du
      * arguments. */
     robj **argv = c->original_argv ? c->original_argv : c->argv;
     int argc = c->original_argv ? c->original_argc : c->argc;
+
+    /* If a script is currently running, the client passed in is a
+     * fake client. Or the client passed in is the original client
+     * if this is a EVAL or alike, doesn't matter. In this case,
+     * use the original client to get the client information. */
+    c = scriptIsRunning() ? scriptGetCaller() : c;
+
     slowlogPushEntryIfNeeded(c, argv, argc, duration);
 }
 
diff --git a/tests/unit/slowlog.tcl b/tests/unit/slowlog.tcl
index f1acbaa0f..1be530d37 100644
--- a/tests/unit/slowlog.tcl
+++ b/tests/unit/slowlog.tcl
@@ -248,4 +248,42 @@ start_server {tags {"slowlog"} overrides {slowlog-log-slower-than 1000000}} {
         
         $rd close
     }
+
+    foreach is_eval {0 1} {
+        test "SLOWLOG - the commands in script are recorded normally - is_eval: $is_eval" {
+            if {$is_eval == 0} {
+                r function load replace "#!lua name=mylib \n redis.register_function('myfunc', function(KEYS, ARGS) server.call('ping') end)"
+            }
+
+            r client setname test-client
+            r config set slowlog-log-slower-than 0
+            r slowlog reset
+
+            if {$is_eval} {
+                r eval "server.call('ping')" 0
+            } else {
+                r fcall myfunc 0
+            }
+            set slowlog_resp [r slowlog get 2]
+            assert_equal 2 [llength $slowlog_resp]
+
+            # The first one is the script command, and the second one is the ping command executed in the script
+            # Each slowlog contains: id, timestamp, execution time, command array, ip:port, client name
+            set script_cmd [lindex $slowlog_resp 0]
+            set ping_cmd [lindex $slowlog_resp 1]
+
+            # Make sure the command are logged.
+            if {$is_eval} {
+                assert_equal {eval server.call('ping') 0} [lindex $script_cmd 3]
+            } else {
+                assert_equal {fcall myfunc 0} [lindex $script_cmd 3]
+            }
+            assert_equal {ping} [lindex $ping_cmd 3]
+
+            # Make sure the client info are the logged.
+            assert_equal [lindex $script_cmd 4] [lindex $ping_cmd 4]
+            assert_equal {test-client} [lindex $script_cmd 5]
+            assert_equal {test-client} [lindex $ping_cmd 5]
+        }
+    }
 }