diff --git a/client/browseAvahi.cpp b/client/browseAvahi.cpp
index 909eadaf..b1641240 100644
--- a/client/browseAvahi.cpp
+++ b/client/browseAvahi.cpp
@@ -88,16 +88,15 @@ void BrowseAvahi::resolve_callback(
 			browseAvahi->result_.valid_ = true;
 
 			t = avahi_string_list_to_string(txt);
-			logO
-				<< "\t" << host_name << ":" << port << "(" << a << ")\n"
-				<< "\tTXT=" << t << "\n"
-				<< "\tProto=" << (int)protocol << "\n"
-				<< "\tcookie is " << avahi_string_list_get_service_cookie(txt) << "\n"
-				<< "\tis_local: " << !!(flags & AVAHI_LOOKUP_RESULT_LOCAL) << "\n"
-				<< "\tour_own: " << !!(flags & AVAHI_LOOKUP_RESULT_OUR_OWN) << "\n"
-				<< "\twide_area: " << !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA) << "\n"
-				<< "\tmulticast: " << !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST) << "\n"
-				<< "\tcached: " << !!(flags & AVAHI_LOOKUP_RESULT_CACHED) << "\n";
+			logO << "\t" << host_name << ":" << port << "(" << a << ")\n";
+			logD << "\tTXT=" << t << "\n";
+			logD << "\tProto=" << (int)protocol << "\n";
+			logD << "\tcookie is " << avahi_string_list_get_service_cookie(txt) << "\n";
+			logD << "\tis_local: " << !!(flags & AVAHI_LOOKUP_RESULT_LOCAL) << "\n";
+			logD << "\tour_own: " << !!(flags & AVAHI_LOOKUP_RESULT_OUR_OWN) << "\n";
+			logD << "\twide_area: " << !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA) << "\n";
+			logD << "\tmulticast: " << !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST) << "\n";
+			logD << "\tcached: " << !!(flags & AVAHI_LOOKUP_RESULT_CACHED) << "\n";
 			avahi_free(t);
 		}
 	}
diff --git a/client/doubleBuffer.h b/client/doubleBuffer.h
index 669f126f..373f5f82 100644
--- a/client/doubleBuffer.h
+++ b/client/doubleBuffer.h
@@ -80,6 +80,11 @@ public:
 		return buffer.size();
 	}
 
+	inline bool empty() const
+	{
+		return (buffer.size() == 0);
+	}
+
 	void setSize(size_t size)
 	{
 		bufferSize = size;
diff --git a/client/timeProvider.cpp b/client/timeProvider.cpp
index 50c0779a..2aa2fd3b 100644
--- a/client/timeProvider.cpp
+++ b/client/timeProvider.cpp
@@ -30,7 +30,7 @@ void TimeProvider::setDiffToServer(double ms)
 {
 	long now = chronos::getTickCount();
 	/// clear diffBuffer if last update is older than a minute
-	if (now > lastTimeSync_ + 60*1000)
+	if (!diffBuffer_.empty() && (now > lastTimeSync_ + 60*1000))
 	{
 		logO << "Last time sync older than a minute. Clearing time buffer\n";
 		diffToServer_ = ms*1000;