diff --git a/internal/controller/valkey_controller.go b/internal/controller/valkey_controller.go
index 0af2e87..1c5f2a8 100644
--- a/internal/controller/valkey_controller.go
+++ b/internal/controller/valkey_controller.go
@@ -433,6 +433,10 @@ func (r *ValkeyReconciler) upsertConfigMap(ctx context.Context, valkey *hyperv1.
 func (r *ValkeyReconciler) GetPassword(ctx context.Context, valkey *hyperv1.Valkey) (string, error) {
 	logger := log.FromContext(ctx)
 
+	if valkey.Spec.ServicePassword != nil {
+		return r.getServicePassword(ctx, valkey)
+	}
+
 	secret := &corev1.Secret{}
 	if err := r.Get(ctx, types.NamespacedName{Namespace: valkey.Namespace, Name: valkey.Name}, secret); err != nil {
 		logger.Error(err, "failed to get secret")