diff --git a/lib/heroku/cli.rb b/lib/heroku/cli.rb
index bc526b95d..253f6ae8b 100644
--- a/lib/heroku/cli.rb
+++ b/lib/heroku/cli.rb
@@ -42,6 +42,8 @@ def self.start(*args)
   end
 
   def self.warn_if_using_heroku_accounts
-    warn "WARNING: deprecated ddollar/heroku-accounts plugin is installed." if defined?(Heroku::Command::Accounts)
+    if defined?(Heroku::Command::Accounts) && defined?(Heroku::Command::Accounts.account)
+      warn "WARNING: deprecated ddollar/heroku-accounts plugin is installed."
+    end
   end
 end