diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
index 8a9e9824914..5dec4546a26 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -295,24 +295,15 @@ class CodeWhispererConfigurable(private val project: Project) :
                         ToolkitConnectionManagerListener.TOPIC,
                         object : ToolkitConnectionManagerListener {
                             override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                                enabled(isCodeWhispererEnabled(project) && !isSso)
+                                enabled(isCodeWhispererEnabled(project))
                             }
                         }
                     )
 
-                    enabled(invoke && !isSso)
+                    enabled(invoke)
 
-                    if (isSso) {
-                        bindSelected({ false }, {})
-                    } else {
-                        bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)
-                    }
+                    bindSelected(codeWhispererSettings::isMetricOptIn, codeWhispererSettings::toggleMetricOptIn)
                 }.comment(message("aws.settings.codewhisperer.configurable.opt_out.tooltip"))
-                if (isSso) {
-                    label(message("aws.settings.codewhisperer.configurable.controlled_by_admin")).applyToComponent {
-                        font = font.deriveFont(Font.ITALIC).deriveFont((font.size - 1).toFloat())
-                    }.enabled(false)
-                }
             }
         }
     }.also {