diff --git a/tasks/main.yml b/tasks/main.yml
index 394b98c..52c448a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,7 +8,6 @@
 
   - name: Postgres replication standby
     shell: '{{ apigee_service }} apigee-postgresql setup-replication-on-standby -f {{ opdk_installation_config_file }}'
-    register: replication_output
 
   rescue:
     - name: Determine if max_wal_senders value must be updated
@@ -17,10 +16,13 @@
 
     - name: Postgres replication standby
       shell: '{{ apigee_service }} apigee-postgresql setup-replication-on-standby -f {{ opdk_installation_config_file }}'
-      register: replication_output
 
-- name: Ensure component is started
-  shell: "{{ apigee_service }} apigee-postgresql start"
+- block:
+  - name: Validate postgres replication standby
+    shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
+  rescue:
+    - name: Ensure component is started
+      shell: "{{ apigee_service }} apigee-postgresql start"
 
-- name: Validate postgres replication standby
-  shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
+    - name: Validate postgres replication standby
+      shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'