diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 4445654..06288a5 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -399,6 +399,7 @@ define(function(require){
 											return ret;
 										}
 									}),
+									isCnamEnabled: monster.util.isNumberFeatureEnabled('cnam'),
 									isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
 									spareLinkEnabled: (_.countBy(accountNumbers, function(number) {return number.used_by ? 'assigned' : 'spare';})['spare'] > 0)
 								},
@@ -845,33 +846,35 @@ define(function(require){
 				}
 			});
 
-			container.on('click', '.number-element .callerId-number', function() {
-				var cnamCell = $(this).parents('.number-element').first(),
-					phoneNumber = cnamCell.find('.remove-number').data('number');
+			if (monster.util.isNumberFeatureEnabled('cnam')) {
+				container.on('click', '.number-element .callerId-number', function() {
+					var cnamCell = $(this).parents('.number-element').first(),
+						phoneNumber = cnamCell.find('.remove-number').data('number');
 
-				if(phoneNumber) {
-					var args = {
-						phoneNumber: phoneNumber,
-						callbacks: {
-							success: function(data) {
-								if('cnam' in data.data && data.data.cnam.display_name) {
-									cnamCell.find('.features i.feature-outbound_cnam').addClass('active');
-								} else {
-									cnamCell.find('.features i.feature-outbound_cnam').removeClass('active');
-								}
+					if(phoneNumber) {
+						var args = {
+							phoneNumber: phoneNumber,
+							callbacks: {
+								success: function(data) {
+									if('cnam' in data.data && data.data.cnam.display_name) {
+										cnamCell.find('.features i.feature-outbound_cnam').addClass('active');
+									} else {
+										cnamCell.find('.features i.feature-outbound_cnam').removeClass('active');
+									}
 
-								if('cnam' in data.data && data.data.cnam.inbound_lookup) {
-									cnamCell.find('.features i.feature-inbound_cnam').addClass('active');
-								} else {
-									cnamCell.find('.features i.feature-inbound_cnam').removeClass('active');
+									if('cnam' in data.data && data.data.cnam.inbound_lookup) {
+										cnamCell.find('.features i.feature-inbound_cnam').addClass('active');
+									} else {
+										cnamCell.find('.features i.feature-inbound_cnam').removeClass('active');
+									}
 								}
 							}
-						}
-					};
+						};
 
-					monster.pub('common.callerId.renderPopup', args);
-				}
-			});
+						monster.pub('common.callerId.renderPopup', args);
+					}
+				});
+			}
 
 			if (monster.util.isNumberFeatureEnabled('e911')) {
 				container.on('click', '.number-element .e911-number', function() {
diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html
index 3e4c0df..7dcb67b 100644
--- a/views/strategy-numbers.html
+++ b/views/strategy-numbers.html
@@ -14,7 +14,9 @@
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 						<ul class="dropdown-menu">
 						{{#unless isLocal}}
-							<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../i18n.callerId }}</a></li>
+							{{#if ../../isCnamEnabled}}
+								<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../../i18n.callerId }}</a></li>
+							{{/if}}
 							{{#if ../../isE911Enabled}}
 								<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../../i18n.e911 }}</a></li>
 							{{/if}}