diff --git a/src/eval.c b/src/eval.c
index 587fb3b7a..0a97bb253 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1677,7 +1677,7 @@ ldbLog(sdsnew("                     next line of code."));
             luaPushError(lua, "script aborted for user request");
             luaError(lua);
         } else if (argc > 1 &&
-                   (!strcasecmp(argv[0],"r") || !strcasecmp(argv[0],"redis"))) {
+                   (!strcasecmp(argv[0],"r") || !strcasecmp(argv[0],REDIS_API_NAME) || !strcasecmp(argv[0],SERVER_API_NAME))) {
             ldbRedis(lua,argv,argc);
             ldbSendLogs();
         } else if ((!strcasecmp(argv[0],"p") || !strcasecmp(argv[0],"print"))) {
diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index c365f09c8..3fd4190ba 100644
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -1547,6 +1547,19 @@ start_server {tags {"scripting needs:debug external:skip"}} {
         reconnect
         assert_equal [r ping] {PONG}
     }
+    
+    test {Test scripting debug lua server invocations} {
+        r script debug sync
+        r eval {return 'hello'} 0 
+        set cmd "*2\r\n\$6\r\nserver\r\n\$4\r\nping\r\n"
+        r write $cmd
+        r flush
+        set ret [r read]
+        puts $ret
+        assert_match {*PONG*} $ret
+        reconnect 
+        assert_equal [r ping] {PONG}
+    }
 }
 
 start_server {tags {"scripting external:skip"}} {