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