diff --git a/src/connection.c b/src/connection.c
index b70e32f..02bae7b 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -408,9 +408,8 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
 //--------------------------------------------------------------------
 // Return codes for wait_connection_ready
 #define WAIT_SUCCESS	0
-#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302 or 303
-#define WAIT_ACTION_BACKOFF	2	// if wait status is 403
-#define WAIT_FAIL 	3
+#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303, or 403
+#define WAIT_FAIL 	2
 
 #define FREE_NON_NULL_PTR(ptr) if (NULL != ptr) free(ptr)
 
@@ -449,7 +448,7 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
     /* clear auth token in cfg so that we will refetch auth token */
     memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
     ParodusError("Received Unauthorized response with status: %d\n", wait_status);
-    return WAIT_ACTION_BACKOFF;
+    return WAIT_ACTION_RETRY;
   }
   ParodusError("Client connection timeout\n");	
   ParodusError("RDK-10037 - WebPA Connection Lost\n");
@@ -460,9 +459,8 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
 //--------------------------------------------------------------------
 // Return codes for connect_and_wait
 #define CONN_WAIT_SUCCESS	 0
-#define CONN_WAIT_ACTION_RETRY	 1	// if wait_status is 307, 302 or 303
-#define CONN_WAIT_ACTION_BACKOFF 2	// if wait status is 403
-#define CONN_WAIT_RETRY_DNS 	 3
+#define CONN_WAIT_ACTION_RETRY	 1	// if wait_status is 307, 302, 303, or 403
+#define CONN_WAIT_RETRY_DNS 	 2
 
 int connect_and_wait (create_connection_ctx_t *ctx)
 {
@@ -500,9 +498,6 @@ int connect_and_wait (create_connection_ctx_t *ctx)
     if (wait_rtn == WAIT_ACTION_RETRY)
       return CONN_WAIT_ACTION_RETRY;
 
-    if (wait_rtn == WAIT_ACTION_BACKOFF)
-      return CONN_WAIT_ACTION_BACKOFF;
-
     // try ipv4 if we need to      
     if ((0==force_flags) && (0==ctx->current_server->allow_insecure) && is_ipv6) {
       is_ipv6 = false;
diff --git a/tests/test_connection.c b/tests/test_connection.c
index a43a382..d144162 100644
--- a/tests/test_connection.c
+++ b/tests/test_connection.c
@@ -585,9 +585,8 @@ void test_nopoll_connect ()
 
 // Return codes for wait_connection_ready
 #define WAIT_SUCCESS	0
-#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302 or 303
-#define WAIT_ACTION_BACKOFF	2	// if wait status is 403
-#define WAIT_FAIL 	3
+#define WAIT_ACTION_RETRY	1	// if wait_status is 307, 302, 303, or 403
+#define WAIT_FAIL 	2
 
 void test_wait_connection_ready ()
 {
@@ -643,7 +642,7 @@ void test_wait_connection_ready ()
     mock_wait_status = 403;
     will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false);
     expect_function_call (nopoll_conn_wait_for_status_until_connection_ready);
-    assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_BACKOFF);
+    assert_int_equal (wait_connection_ready (&ctx), WAIT_ACTION_RETRY);
 
     free_extra_headers (&ctx);
     free_header_info (&ctx.header_info);
@@ -651,9 +650,8 @@ void test_wait_connection_ready ()
 
 // Return codes for connect_and_wait
 #define CONN_WAIT_SUCCESS	0
-#define CONN_WAIT_ACTION_RETRY	 1	// if wait_status is 307, 302 or 303
-#define CONN_WAIT_ACTION_BACKOFF 2	// if wait status is 403
-#define CONN_WAIT_RETRY_DNS 	 3
+#define CONN_WAIT_ACTION_RETRY	 1	// if wait_status is 307, 302, 303, or 403
+#define CONN_WAIT_RETRY_DNS 	 2
 
 void test_connect_and_wait ()
 {