diff --git a/src/blameActiveLineController.ts b/src/blameActiveLineController.ts
index d499576..658de2a 100644
--- a/src/blameActiveLineController.ts
+++ b/src/blameActiveLineController.ts
@@ -62,13 +62,6 @@ export class BlameActiveLineController extends Disposable {
             changed = true;
             if (config.statusBar.enabled) {
                 this._statusBarItem = this._statusBarItem || window.createStatusBarItem(StatusBarAlignment.Right, 1000);
-                switch (config.statusBar.command) {
-                    case StatusBarCommand.ToggleCodeLens:
-                        if (config.codeLens.visibility !== 'ondemand') {
-                            config.statusBar.command = StatusBarCommand.BlameAnnotate;
-                        }
-                        break;
-                }
                 this._statusBarItem.command = config.statusBar.command;
             }
             else if (!config.statusBar.enabled && this._statusBarItem) {
diff --git a/src/gitService.ts b/src/gitService.ts
index af9c409..6503f04 100644
--- a/src/gitService.ts
+++ b/src/gitService.ts
@@ -144,7 +144,7 @@ export class GitService extends Disposable {
                 this._codeLensProvider = undefined;
             }
 
-            setCommandContext(CommandContext.CanToggleCodeLens, config.codeLens.visibility === CodeLensVisibility.OnDemand && (config.codeLens.recentChange.enabled || config.codeLens.authors.enabled));
+            setCommandContext(CommandContext.CanToggleCodeLens, config.codeLens.visibility !== CodeLensVisibility.Off && (config.codeLens.recentChange.enabled || config.codeLens.authors.enabled));
         }
 
         if (advancedChanged) {
@@ -827,11 +827,10 @@ export class GitService extends Disposable {
     }
 
     toggleCodeLens(editor: TextEditor) {
-        if (this.config.codeLens.visibility !== CodeLensVisibility.OnDemand ||
+        if (this.config.codeLens.visibility === CodeLensVisibility.Off ||
             (!this.config.codeLens.recentChange.enabled && !this.config.codeLens.authors.enabled)) return;
 
-        Logger.log(`toggleCodeLens(${editor})`);
-
+        Logger.log(`toggleCodeLens()`);
         if (this._codeLensProviderDisposable) {
             this._codeLensProviderDisposable.dispose();
             this._codeLensProviderDisposable = undefined;