diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 2393607f3e..a32879166b 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -39,6 +39,8 @@
 SWITCH_BEGIN_EXTERN_C
 #define SWITCH_ENT_ORIGINATE_DELIM ":_:"
 #define SWITCH_BLANK_STRING ""
+#define SWITCH_TON_UNDEF 255
+#define SWITCH_NUMPLAN_UNDEF 255
 #ifdef WIN32
 #define SWITCH_SEQ_FWHITE FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY
 #define SWITCH_SEQ_FRED FOREGROUND_RED | FOREGROUND_INTENSITY
diff --git a/src/switch_caller.c b/src/switch_caller.c
index 159c58cf12..f1f0728323 100644
--- a/src/switch_caller.c
+++ b/src/switch_caller.c
@@ -69,13 +69,21 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor
 	profile_dup_clean(dialplan, profile->dialplan, pool);
 	profile_dup_clean(caller_id_name, profile->caller_id_name, pool);
 	profile_dup_clean(caller_id_number, profile->caller_id_number, pool);
+	profile->caller_ton = SWITCH_TON_UNDEF;
+	profile->caller_numplan = SWITCH_NUMPLAN_UNDEF;
 	profile_dup_clean(network_addr, profile->network_addr, pool);
 	profile_dup_clean(ani, profile->ani, pool);
+	profile->ani_ton = SWITCH_TON_UNDEF;
+	profile->ani_numplan = SWITCH_NUMPLAN_UNDEF;
 	profile_dup_clean(aniii, profile->aniii, pool);
 	profile_dup_clean(rdnis, profile->rdnis, pool);
+	profile->rdnis_ton = SWITCH_TON_UNDEF;
+	profile->rdnis_numplan = SWITCH_NUMPLAN_UNDEF;
 	profile_dup_clean(source, profile->source, pool);
 	profile_dup_clean(context, profile->context, pool);
 	profile_dup_clean(destination_number, profile->destination_number, pool);
+	profile->destination_number_ton = SWITCH_TON_UNDEF;
+	profile->destination_number_numplan = SWITCH_NUMPLAN_UNDEF;
 	profile->uuid = SWITCH_BLANK_STRING;
 	profile->chan_name = SWITCH_BLANK_STRING;
 	profile->callee_id_name = SWITCH_BLANK_STRING;