diff --git a/src/switch_apr.c b/src/switch_apr.c
index 8337d0e5a4..25ff864129 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -837,27 +837,23 @@ SWITCH_DECLARE(switch_status_t) switch_sockaddr_info_get(switch_sockaddr_t ** sa
 SWITCH_DECLARE(switch_status_t) switch_socket_opt_set(switch_socket_t *sock, int32_t opt, int32_t on)
 {
 	if (opt == SWITCH_SO_TCP_KEEPIDLE) {
-		int r = -10;
-
 #if defined(TCP_KEEPIDLE)
+		int r = -10;
 		r = setsockopt(sock->socketdes, SOL_TCP, TCP_KEEPIDLE, (void *)&on, sizeof(on));
+		return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
 #else
 		return SWITCH_STATUS_NOTIMPL;
 #endif
-
-		return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
 	}
 
 	if (opt == SWITCH_SO_TCP_KEEPINTVL) {
-		int r = -10;
-
 #if defined(TCP_KEEPINTVL)
+		int r = -10;
 		r = setsockopt(sock->socketdes, SOL_TCP, TCP_KEEPINTVL, (void *)&on, sizeof(on));
+		return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
 #else
 		return SWITCH_STATUS_NOTIMPL;
 #endif
-
-		return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
 	}
 
 	return apr_socket_opt_set(sock, opt, on);