diff --git a/mailnews/moz.configure b/mailnews/moz.configure
index 968a003b4a..f4fb6adf65 100644
--- a/mailnews/moz.configure
+++ b/mailnews/moz.configure
@@ -8,7 +8,11 @@
 # =========================================================
 # = Lightning extension
 # =========================================================
-option('--enable-calendar',
+@depends(application)
+def calendar_default(app):
+    return app[0].endswith('/suite')
+
+option('--enable-calendar', default=calendar_default,
        help='Enable building of the Lightning calendar extension')
 
 
diff --git a/suite/moz.configure b/suite/moz.configure
index 3932cabcd8..13ba94fa4d 100644
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -13,8 +13,6 @@ imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_SYNC', False)
 imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
 
-imply_option('--enable-calendar', True)
-
 
 @depends(application)
 def is_comm(app):