diff --git a/lib/icingadb/redisconnection.cpp b/lib/icingadb/redisconnection.cpp
index bd94273d9..d1e4474e3 100644
--- a/lib/icingadb/redisconnection.cpp
+++ b/lib/icingadb/redisconnection.cpp
@@ -64,7 +64,11 @@ void LogQuery(RedisConnection::Query& query, Log& msg)
 			break;
 		}
 
-		msg << " '" << arg << '\'';
+		if (arg.GetLength() > 64) {
+			msg << " '" << arg.SubStr(0, 61) << "...'";
+		} else {
+			msg << " '" << arg << '\'';
+		}
 	}
 }