diff --git a/Packages/lesiontracker/client/collections/LocationResponses.js b/Packages/lesiontracker/client/collections/LocationResponses.js
index dff9eaff2..6f6f43144 100644
--- a/Packages/lesiontracker/client/collections/LocationResponses.js
+++ b/Packages/lesiontracker/client/collections/LocationResponses.js
@@ -42,10 +42,3 @@ LocationResponses.insert({
     code: 'EX',
     description: ''
 });
-
-// TODO: Check if this is a copy of Not evaluable?
-LocationResponses.insert({
-    text: 'Non-measurable',
-    code: 'NM',
-    description: ''
-});
\ No newline at end of file
diff --git a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
index 9da09caa5..559564493 100644
--- a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
+++ b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
@@ -16,6 +16,7 @@
             <div class="locationResponse">
                 <label>Response</label>
                 <select id="selectNonTargetLesionLocationResponse">
+                    <option value="-1" selected="true"></option>
                     {{ #each locationResponses}}
                     {{ #if code }}
                         <option value={{code}} selected={{selected}}>{{code}} - {{text}}</option>
@@ -48,6 +49,7 @@
             <div class="locationResponse">
                 <label>Response</label>
                 <select id="selectNonTargetLesionLocationResponse">
+                    <option value="-1" selected="true"></option>
                     {{ #each locationResponses}}
                     {{ #if code }}
                     <option value={{code}} selected={{selected}}>{{code}} - {{text}}</option>
diff --git a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
index 2259fde73..de1514271 100644
--- a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
+++ b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
@@ -94,8 +94,6 @@ function getLesionLocationCallback(measurementData, eventData) {
     });
 
     if (timepoint && timepoint.timepointType === 'baseline') {
-        selectNonTargetResponse('NM');
-    } else if (timepoint && timepoint.timepointType === 'followup') {
         selectNonTargetResponse('Present');
     } else {
         selectNonTargetResponse();
diff --git a/Packages/lesiontracker/lib/convertToNonTarget.js b/Packages/lesiontracker/lib/convertToNonTarget.js
index 4d574e8be..316414500 100644
--- a/Packages/lesiontracker/lib/convertToNonTarget.js
+++ b/Packages/lesiontracker/lib/convertToNonTarget.js
@@ -23,10 +23,8 @@ convertToNonTarget = function(measurementData) {
         isTarget: false,
         measurementType: toolType
     };
-
+    
     if (timepoint && timepoint.timepointType === 'baseline') {
-        newMeasurement.response = 'NM';
-    } else if (timepoint && timepoint.timepointType === 'followup') {
         newMeasurement.response = 'Present';
     } else {
         newMeasurement.response = '';