diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 3eac4f36..bfd979fd 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -3,6 +3,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <QDateTime>
+#include <QSettings>
 #include <iostream>
 #ifdef Q_OS_UNIX
 # include <sys/types.h>
@@ -44,13 +45,44 @@ void ServerLogger::logMessage(QString message, void *caller)
 	if (!logFile)
 		return;
 	
-	bufferMutex.lock();
 	QString callerString;
 	if (caller)
 		callerString = QString::number((qulonglong) caller, 16) + " ";
-	buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
-	bufferMutex.unlock();
-	
+		
+	//filter out all log entries based on loglevel value in configuration file
+	QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
+	int found = 0; int capture = 0; int loglevel = 0;
+	loglevel = settings->value("server/loglevel").toInt();
+	switch (loglevel)
+	{
+		case 1:
+			break;
+
+		case 2:
+
+			// filter message log data
+			found = message.indexOf("Adding room: ID=", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Starting status update clock", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Starting server on port", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Server listening.", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Server::loginUser:", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Server::removeClient:", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Command_Login.ext", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Command_RoomSay.ext", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Command_Message.ext", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			found = message.indexOf("Command_GameSay.ext", Qt::CaseInsensitive); if (found != -1){ capture = 1; }
+			if (capture != 0){
+				bufferMutex.lock();
+				buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
+				bufferMutex.unlock();
+			}
+			break;
+
+		default:
+			bufferMutex.lock();
+			buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
+			bufferMutex.unlock();
+	}
 	emit sigFlushBuffer();
 }