diff --git a/src/scripting.c b/src/scripting.c
index 4b36a085..6c311dbe 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -1367,7 +1367,7 @@ void evalGenericCommand(client *c, int evalsha) {
          * script timeout was detected. */
         aeCreateFileEvent(server.el,c->fd,AE_READABLE,
                           readQueryFromClient,c);
-        if (server.masterhost && server.master) {
+        if (server.masterhost && server.master && !(server.master->flags & CLIENT_UNBLOCKED)) {
             server.master->flags |= CLIENT_UNBLOCKED;
             listAddNodeTail(server.unblocked_clients,server.master);
         }