diff --git a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html
index 991e53f..2caf4cd 100644
--- a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html
+++ b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.html
@@ -93,8 +93,6 @@
                             </small>
                           </div>
                         </div>
-                      </div>
-                      <div class="row">
                         <div class="col-md-6">
                           <div class="form-group">
                             <label for="voltageId" style="color: #ffffff"
@@ -159,8 +157,6 @@
                             </small>
                           </div>
                         </div>
-                      </div>
-                      <div class="row">
                         <div class="col-md-6">
                           <div class="form-group">
                             <label for="durationId" style="color: #ffffff"
@@ -192,39 +188,6 @@
                             </small>
                           </div>
                         </div>
-                        <div class="col-md-6">
-                          <div class="form-group">
-                            <label for="statusId" style="color: #ffffff"
-                              >Status *</label
-                            >
-                            <select
-                              id="statusId"
-                              class="form-control"
-                              formControlName="statusId"
-                              [ngClass]="{
-                                'is-invalid': submitted && f.statusId.errors
-                              }"
-                            >
-                              <option
-                                *ngFor="let data of dataMasterStatus"
-                                [value]="data.id"
-                              >
-                                {{ data.name }}
-                              </option>
-                            </select>
-                            <small
-                              class="form-text text-muted danger"
-                              *ngIf="submitted && f.statusId.errors"
-                              class="invalid-feedback"
-                            >
-                              <div *ngIf="f.statusId.errors.required">
-                                Status is required
-                              </div>
-                            </small>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="row">
                         <div class="col-md-6">
                           <div class="form-group">
                             <label for="roomBuildingId" style="color: #ffffff"
diff --git a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.ts b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.ts
index c44893e..47af959 100644
--- a/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.ts
+++ b/src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.ts
@@ -59,7 +59,6 @@ export class AddEditDeviceComponent implements OnInit{
       voltageId: ["", Validators.required],
       typeId: ["", Validators.required],
       durationId: ["", Validators.required],
-      statusId: ["", Validators.required],
       roomBuildingId: ["", Validators.required],
       watt: ["", Validators.required],
     });
@@ -118,7 +117,6 @@ export class AddEditDeviceComponent implements OnInit{
       voltageId: data.data.voltageId,
       typeId: data.data.typeId,
       durationId: data.data.durationId,
-      statusId: data.data.statusId,
       roomBuildingId: data.data.roomBuildingId,
       watt: data.data.watt
     });
@@ -133,7 +131,6 @@ export class AddEditDeviceComponent implements OnInit{
     this.projectInfo.get('voltageId').disable()
     this.projectInfo.get('typeId').disable()
     this.projectInfo.get('durationId').disable()
-    this.projectInfo.get('statusId').disable()
     this.projectInfo.get('roomBuildingId').disable()
     this.projectInfo.get('watt').disable()
   }