diff --git a/lib/MySQL_Logger.cpp b/lib/MySQL_Logger.cpp
index 4c5328261..503934637 100644
--- a/lib/MySQL_Logger.cpp
+++ b/lib/MySQL_Logger.cpp
@@ -74,8 +74,8 @@ void MySQL_Logger::log_request(MySQL_Session *sess) {
 	ev.set_end_time(sess->CurrentQuery.end_time);
 	ev.set_query_digest(GloQPro->get_digest(sess->CurrentQuery.QueryParserArgs));
 	ev.set_query((const char *)sess->CurrentQuery.QueryPointer);
-	ev.set_server(NULL);
-	ev.set_client(NULL);
+	ev.set_server("");
+	ev.set_client("");
 	wrlock();
 	ev.SerializeToOstream(logfile);
 	//*logfile << t << std::endl << id << std::endl << std::endl ;
diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp
index ec541f0ef..a776b8bc4 100644
--- a/lib/ProxySQL_Admin.cpp
+++ b/lib/ProxySQL_Admin.cpp
@@ -42,6 +42,7 @@ extern MySQL_Authentication *GloMyAuth;
 extern ProxySQL_Admin *GloAdmin;
 extern Query_Processor *GloQPro;
 extern MySQL_Threads_Handler *GloMTH;
+extern MySQL_Logger *GloMyLogger;
 //#define PANIC(msg)  { perror(msg); return -1; }
 #define PANIC(msg)  { perror(msg); exit(EXIT_FAILURE); }
 
@@ -390,6 +391,9 @@ bool admin_handler_command_proxysql(char *query_no_space, unsigned int query_no_
 	if (query_no_space_length==strlen("PROXYSQL FLUSH LOGS") && !strncasecmp("PROXYSQL FLUSH LOGS",query_no_space, query_no_space_length)) {
 		proxy_info("Received PROXYSQL FLUSH LOGS command\n");
 		ProxySQL_Admin *SPA=(ProxySQL_Admin *)pa;
+		if (GloMyLogger) {
+			GloMyLogger->flush_log();
+		}
 		SPA->flush_error_log();
 		SPA->send_MySQL_OK(&sess->client_myds->myprot, NULL);
 		return false;