diff --git a/app/models/account.rb b/app/models/account.rb
index 826eb1c..de3a812 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -84,7 +84,7 @@ class Account < ApplicationRecord
end
def taskme_enabled?
- plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme"
+ ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
end
def plan_name
diff --git a/app/views/application/_sidebar.html.erb b/app/views/application/_sidebar.html.erb
index df75cad..b6b0cbf 100644
--- a/app/views/application/_sidebar.html.erb
+++ b/app/views/application/_sidebar.html.erb
@@ -11,12 +11,14 @@