diff --git a/main/manager.c b/main/manager.c
index 18755b507df36d412f885ca2f2b3a9b25b6fe29a..fe4e7c325d2289db2775c957f4516dd7bc2ea39f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -4728,8 +4728,8 @@ static int action_originate(struct mansession *s, const struct message *m)
 	pthread_t th;
 	int bridge_early = 0;
 
-	if (strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID ||
-		strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID) {
+	if ((!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID) ||
+		(!ast_strlen_zero(assignedids.uniqueid2) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
 		ast_log(LOG_WARNING, "Uniqueid length exceeds maximum of %d\n", AST_MAX_UNIQUEID);
 	}
 
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index 37595006ddedc520f3b39657ac996ccc4b846eed..0f4486b52ba71f252baebed90d9037411e514e75 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -779,7 +779,7 @@ static void ari_channels_handle_originate_with_id(const char *args_endpoint,
 	struct ast_assigned_ids assignedids = {args_channel_id, args_other_channel_id};
 
 	if ((!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid) >= AST_MAX_UNIQUEID) || 
-		(!ast_strlen_zero(assignedids.uniqueid) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
+		(!ast_strlen_zero(assignedids.uniqueid2) && strlen(assignedids.uniqueid2) >= AST_MAX_UNIQUEID)) {
 		ast_log(LOG_WARNING, "Uniqueid length exceeds maximum of %d\n", AST_MAX_UNIQUEID);
 	}