diff --git a/clean_files.txt b/clean_files.txt
index 6e73a804..24a99fd4 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -60,6 +60,7 @@ plugins/available/xterm.plugin.bash
 completion/available/awless.completion.bash
 completion/available/brew.completion.bash
 completion/available/cargo.completion.bash
+completion/available/conda.completion.bash
 completion/available/knife.completion.bash
 completion/available/packer.completion.bash
 completion/available/pipx.completion.bash
diff --git a/completion/available/conda.completion.bash b/completion/available/conda.completion.bash
index cb5a15da..f5a61e59 100644
--- a/completion/available/conda.completion.bash
+++ b/completion/available/conda.completion.bash
@@ -1,4 +1,11 @@
-#!/usr/bin/env bash
-which register-python-argcomplete > /dev/null \
-  && eval "$(register-python-argcomplete conda)" \
-  || echo "Please install argcomplete to use conda completion"
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "conda completion"
+
+if _command_exists conda; then
+	if _command_exists register-python-argcomplete; then
+		eval "$(register-python-argcomplete conda)"
+	else
+		_log_warning "Argcomplete not found. Please run 'conda install argcomplete'"
+	fi
+fi