diff --git a/metron-interface/metron-config/src/app/model/sensor-parser-config.ts b/metron-interface/metron-config/src/app/model/sensor-parser-config.ts
index d83ef313bb..96bdbbf0c6 100644
--- a/metron-interface/metron-config/src/app/model/sensor-parser-config.ts
+++ b/metron-interface/metron-config/src/app/model/sensor-parser-config.ts
@@ -23,7 +23,7 @@ export class SensorParserConfig {
   writerClassName: string;
   errorWriterClassName: string;
   invalidWriterClassName: string;
-  parserConfig: {};
+  parserConfig: { [key: string]: any; }
   fieldTransformations: FieldTransformer[];
   numWorkers: number;
   numAckers: number;
@@ -35,13 +35,11 @@ export class SensorParserConfig {
   errorWriterNumTasks: number;
   spoutConfig: {};
   stormConfig: {};
-  timestampField: string;
 
   constructor() {
     this.parserConfig = {};
     this.fieldTransformations = [];
     this.spoutConfig = {};
     this.stormConfig = {};
-    this.timestampField = 'timestamp';
   }
 }
diff --git a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.html b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.html
index c85d37678a..aefb05f427 100644
--- a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.html
+++ b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.html
@@ -83,12 +83,6 @@
                     </div>
                 </div>
 
-                <div class="form-group" *ngIf="isGrokParser(sensorParserConfig)" data-qe-id="timestamp-field">
-                    <label attr.for="timestampField">TIMESTAMP *</label>
-                    <input type="text" class="form-control" name="timestampField" formControlName="timestampField" [(ngModel)]="sensorParserConfig.timestampField">
-                    <label *ngIf="!sensorParserConfig.timestampField"><span class="warning-text">Field is required. </span></label>
-                </div>
-
                 <div class="form-group" [ngClass]="{'panel-selected': showFieldSchema }" >
                     <label attr.for="fieldSchema">SCHEMA</label>
                     <div  class="input-group" [attr.disabled]="!isConfigValid()">
@@ -195,7 +189,7 @@
                     </div>
                     <div class="form-group">
                         <label attr.for="parserConfig">PARSER CONFIG</label>
-                        <metron-config-advanced-form name="parserConfig" [(config)]="sensorParserConfig.parserConfig"></metron-config-advanced-form>
+                        <metron-config-advanced-form name="parserConfig" [(config)]="sensorParserConfig.parserConfig" [parserClassName]="sensorParserConfig.parserClassName"></metron-config-advanced-form>
                     </div>
 
                 </div>
diff --git a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.spec.ts b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.spec.ts
index 228125d3a8..e89c9e7e6e 100644
--- a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.spec.ts
+++ b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.spec.ts
@@ -583,7 +583,7 @@ describe('Component: SensorParserConfig', () => {
     );
     component.createForms();
 
-    expect(Object.keys(component.sensorConfigForm.controls).length).toEqual(17);
+    expect(Object.keys(component.sensorConfigForm.controls).length).toEqual(16);
     expect(
       Object.keys(component.transformsValidationForm.controls).length
     ).toEqual(2);
@@ -821,6 +821,7 @@ describe('Component: SensorParserConfig', () => {
     expect(component.isConfigValid()).toEqual(false);
 
     component.grokStatement = 'grok statement';
+    component.sensorParserConfig.parserConfig.timestampField = 'timestamp';
     expect(component.isConfigValid()).toEqual(true);
   }));
 
@@ -1119,8 +1120,11 @@ describe('Component: SensorParserConfig', () => {
     expect(component.showAdvancedParserConfiguration).toEqual(false);
   }));
 
-  it('should be timestamp by default', () => {
-    expect(component.sensorParserConfig.timestampField).toEqual('timestamp');
+  it('should be timestamp by default when parser is Grok', () => {
+    component.sensorParserConfig.parserClassName = 'org.apache.metron.parsers.GrokParser';
+    component.paramsID = 'new';
+    component.onParserTypeChange();
+    expect(component.sensorParserConfig.parserConfig.timestampField).toEqual('timestamp');
   });
 
   it('should be invalid if timestamp field is empty', () => {
@@ -1130,9 +1134,9 @@ describe('Component: SensorParserConfig', () => {
     component.grokStatement = 'grokStatement';
     component.sensorParserConfig = new SensorParserConfig();
     component.sensorParserConfig.parserClassName = 'org.apache.metron.parsers.GrokParser'
-    component.sensorParserConfig.timestampField = '';
+    component.sensorParserConfig.parserConfig.timestampField = '';
     expect(component.isConfigValid()).toEqual(false);
-    component.sensorParserConfig.timestampField = 'timestamp';
+    component.sensorParserConfig.parserConfig.timestampField = 'timestamp';
     expect(component.isConfigValid()).toEqual(true);
   });
 });
diff --git a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
index 31ef9c0588..ec1b163656 100644
--- a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
+++ b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
@@ -78,6 +78,7 @@ export class SensorParserConfigComponent implements OnInit {
   grokStatement = '';
   patternLabel = '';
   currentSensors = [];
+  paramsID: string;
 
   editMode: boolean = false;
 
@@ -191,8 +192,8 @@ export class SensorParserConfigComponent implements OnInit {
 
   ngOnInit() {
     this.route.params.subscribe(params => {
-      let id = params['id'];
-      this.init(id);
+      this.paramsID = params['id'];
+      this.init(this.paramsID);
     });
     this.createForms();
     this.getAvailableParsers();
@@ -210,10 +211,6 @@ export class SensorParserConfigComponent implements OnInit {
       this.sensorParserConfig.parserClassName,
       Validators.required
     );
-    group['timestampField'] = new FormControl(
-      this.sensorParserConfig.timestampField,
-      Validators.required
-    );
     group['grokStatement'] = new FormControl(this.grokStatement);
     group['transforms'] = new FormControl(
       this.sensorParserConfig['transforms']
@@ -317,6 +314,11 @@ export class SensorParserConfigComponent implements OnInit {
   }
 
   onParserTypeChange(): void {
+    if (this.paramsID === 'new' && this.isGrokParser(this.sensorParserConfig)) {
+      this.sensorParserConfig.parserConfig.timestampField = 'timestamp';
+    } else if (this.paramsID === 'new') {
+      delete this.sensorParserConfig.parserConfig.timestampField;
+    }
     this.parserClassValid =
       this.sensorParserConfig.parserClassName !== undefined &&
       this.sensorParserConfig.parserClassName.length > 0;
@@ -338,7 +340,7 @@ export class SensorParserConfigComponent implements OnInit {
             this.kafkaTopicValid &&
             this.parserClassValid &&
             (!isGrokParser || this.isGrokStatementValid()) &&
-            (!isGrokParser || !!this.sensorParserConfig.timestampField);
+            (!isGrokParser || !!this.sensorParserConfig.parserConfig.timestampField);
   }
 
   getKafkaStatus() {
diff --git a/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.html b/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.html
index 945be5fafa..960d78af85 100644
--- a/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.html
+++ b/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.html
@@ -14,16 +14,25 @@
 <form role="form" [formGroup]="configForm">
     <div *ngFor="let key of configKeys">
         <div class="row mx-0 configkey-row">
-            <div class="col-md-10 advanced-input"><input type="text" class="form-control" name="advanced1" value="{{key}}" readonly></div>
+            <div class="col-md-10 advanced-input">
+                <input type="text" class="form-control" name="advanced1" value="{{key}}" readonly>
+            </div>
             <div class="col-md-2">
             </div>
         </div>
         <div class="row  mx-0">
-            <div class="col-md-10 advanced-input"><input type="text" class="form-control" formControlName="{{key}}" [ngModel]="displayValue(key)" (ngModelChange)="saveValue(key, $event)"></div>
-            <div class="col-md-2" (click)="removeConfig(key)">
+            <div class="col-md-10 advanced-input">
+                <input type="text" class="form-control" formControlName="{{key}}" [ngModel]="displayValue(key)" (ngModelChange)="saveValue(key, $event)">
+            </div>
+            <div class="col-md-2" (click)="removeConfig(key)" *ngIf="key !== 'timestampField'">
                 <i class="fa fa-minus fa-4 icon-button" aria-hidden="true" ></i>
             </div>
         </div>
+        <div *ngIf="isGrokParser() && key === 'timestampField'">
+            <label *ngIf="!config['timestampField']">
+                <span class="warning-text">Field is required. </span>
+            </label>
+        </div>
     </div>
     <div class="row  mx-0 new-configkey-row">
         <div class="col-md-10 advanced-input"><input type="text" class="form-control"  (focus)="clearKeyPlaceholder()" (blur)="saveNewConfig()" [ngClass]="{'input-placeholder': newConfigKey == 'enter field'}" formControlName="newConfigKey" [(ngModel)]="newConfigKey"></div>
diff --git a/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.ts b/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.ts
index 5da9d48820..86386e9665 100644
--- a/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.ts
+++ b/metron-interface/metron-config/src/app/shared/advanced-config-form/advanced-config-form.component.ts
@@ -26,6 +26,7 @@ import {FormGroup, Validators, FormControl} from '@angular/forms';
 export class AdvancedConfigFormComponent implements OnInit, OnChanges {
 
   @Input() config: {};
+  @Input() parserClassName: string;
   configKeys: string[] = [];
   newConfigKey: string = 'enter field';
   newConfigValue: string = 'enter value';
@@ -125,4 +126,8 @@ export class AdvancedConfigFormComponent implements OnInit, OnChanges {
 
   }
 
+  isGrokParser(): boolean {
+    return this.parserClassName === 'org.apache.metron.parsers.GrokParser';
+  }
+
 }