diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ServerMessageHandler.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ServerMessageHandler.java
index d0b101e22..149180197 100644
--- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ServerMessageHandler.java
+++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ServerMessageHandler.java
@@ -87,8 +87,12 @@ public static void logMessage(LanguageServerWrapper wrapper, MessageParams param
 		case Warning:
 			LanguageServerPlugin.logWarning(log.toString());
 			break;
+		case Info:
 		default:
-			LanguageServerPlugin.logInfo(log.toString());
+			if (LanguageServerPlugin.isLogTraceEnabled()) {
+				LanguageServerPlugin.logInfo(log.toString());
+			}
+			break;
 		}
 	}