diff --git a/gen/classes.cpp b/gen/classes.cpp
index 14881a803f..deea99ac70 100644
--- a/gen/classes.cpp
+++ b/gen/classes.cpp
@@ -247,7 +247,8 @@ void DtoResolveClass(ClassDeclaration* cd)
     llvm::cast<llvm::OpaqueType>(irstruct->vtblTy.get())->refineAbstractTypeTo(LLArrayType::get(getVoidPtrType(), cd->vtbl.dim));
 
     // log
-    Logger::cout() << "final class type: " << *ts->ir.type->get() << '\n';
+    if (Logger::enabled())
+        Logger::cout() << "final class type: " << *ts->ir.type->get() << '\n';
 
     // pop state
     gIR->structs.pop_back();
diff --git a/gen/tocall.cpp b/gen/tocall.cpp
index f72b0b7b68..05220cc6d5 100644
--- a/gen/tocall.cpp
+++ b/gen/tocall.cpp
@@ -430,10 +430,13 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
     }
 
     #if 1
-    Logger::println("%lu params passed", args.size());
-    for (int i=0; i<args.size(); ++i) {
-        assert(args[i]);
-        Logger::cout() << "arg["<<i<<"] = " << *args[i] << '\n';
+    if (Logger::enabled())
+    {
+        Logger::println("%lu params passed", args.size());
+        for (int i=0; i<args.size(); ++i) {
+            assert(args[i]);
+            Logger::cout() << "arg["<<i<<"] = " << *args[i] << '\n';
+        }
     }
     #endif
 
@@ -442,7 +445,8 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
     if (callableTy->getReturnType() != LLType::VoidTy)
         varname = "tmp";
 
-    Logger::cout() << "Calling: " << *callable << '\n';
+    if (Logger::enabled())
+        Logger::cout() << "Calling: " << *callable << '\n';
 
     // call the function
     CallOrInvoke* call = gIR->CreateCallOrInvoke(callable, args.begin(), args.end(), varname);