diff --git a/internal/server/server.go b/internal/server/server.go
index 98df3f84..56f84a61 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -965,7 +965,11 @@ func (server *Server) handleInputCommand(client *Client, msg *Message) error {
 				}
 			}()
 		}
-		return server.command(msg, client)
+		res, d, err = server.command(msg, client)
+		if msg.Deadline != nil {
+			msg.Deadline.Check()
+		}
+		return res, d, err
 	}()
 	if res.Type() == resp.Error {
 		return writeErr(res.String())