diff --git a/src/gui/gcal-application.c b/src/gui/gcal-application.c
index c3925b70..ff8e2119 100644
--- a/src/gui/gcal-application.c
+++ b/src/gui/gcal-application.c
@@ -507,10 +507,6 @@ static gint
 gcal_application_handle_local_options (GApplication *app,
                                        GVariantDict *options)
 {
-  /* Initialize logging before anything else */
-  if (g_variant_dict_contains (options, "debug"))
-    gcal_log_init ();
-
   if (show_version)
     {
       g_print ("gnome-calendar: Version %s\n", PACKAGE_VERSION);
diff --git a/src/main.c b/src/main.c
index 6d00a855..5d39e1a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,7 @@
 
 #include "config.h"
 #include "gcal-application.h"
+#include "gcal-log.h"
 
 #include <glib/gi18n.h>
 
@@ -34,6 +35,8 @@ main (gint    argc,
 
   g_set_application_name (_("Calendar"));
 
+  gcal_log_init ();
+
   app = gcal_application_new ();
 
   return g_application_run (G_APPLICATION (app), argc, argv);