diff --git a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.controller.js b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.controller.js
index 30d61e8d3..4b4b20b5c 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.controller.js
+++ b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.controller.js
@@ -17,14 +17,6 @@ class EnvironmentVariablesSimpleModeItemController {
     this.onChange(this.index, { ...this.variable, value });
   }
 
-  hasValue() {
-    return typeof this.variable.value !== 'undefined';
-  }
-
-  removeValue() {
-    this.onChange(this.index, { name: this.variable.name });
-  }
-
   $onInit() {
     this.formName = `variableForm${this.index}`;
   }
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
index 329a0787f..943b77c60 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
@@ -1,4 +1,4 @@
-<ng-form class="env-item" name="$ctrl.{{ $ctrl.formName }}">
+<ng-form class="env-item mt-1" name="$ctrl.{{ $ctrl.formName }}">
   <div class="col-sm-5">
     <div class="input-group input-group-sm env-item-key w-full">
       <span class="input-group-addon">name</span>
@@ -25,7 +25,7 @@
       </div>
     </div>
   </div>
-  <div ng-if="$ctrl.hasValue()" class="col-sm-6">
+  <div class="col-sm-6">
     <div class="w-full env-item-value">
       <div class="input-group input-group-sm">
         <span class="input-group-addon">value</span>
@@ -39,21 +39,16 @@
           ng-change="$ctrl.onChangeValue($ctrl.variable.value)"
         />
       </div>
-      <button class="btn btn-sm btn-light" type="button" ng-click="$ctrl.removeValue()"> <i class="fa fa-minus" aria-hidden="true"></i> Remove value </button>
     </div>
     <div class="form-group" ng-show="$ctrl[$ctrl.formName].value.$invalid">
       <div class="col-sm-12 small text-warning">
         <div ng-messages="$ctrl[$ctrl.formName].value.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Value is required. </p>
           <p ng-message="pattern"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Value is invalid. </p>
         </div>
       </div>
     </div>
   </div>
   <div>
-    <button class="btn btn-sm btn-light" type="button" ng-if="!$ctrl.hasValue()" ng-click="$ctrl.onChangeValue('')">
-      <pr-icon icon="'plus'" feather="true"></pr-icon> Add value
-    </button>
     <button class="btn btn-dangerlight" type="button" ng-click="$ctrl.onRemove($ctrl.index)">
       <pr-icon icon="'trash-2'" feather="true" size="'md'"></pr-icon>
     </button>
diff --git a/app/portainer/helpers/formHelper.js b/app/portainer/helpers/formHelper.js
index 74682de7e..dc7d19592 100644
--- a/app/portainer/helpers/formHelper.js
+++ b/app/portainer/helpers/formHelper.js
@@ -6,7 +6,7 @@ angular.module('portainer.app').factory('FormHelper', [
     helper.removeInvalidEnvVars = function (env) {
       for (var i = env.length - 1; i >= 0; i--) {
         var envvar = env[i];
-        if (!envvar.value || !envvar.name) {
+        if (!envvar.name) {
           env.splice(i, 1);
         }
       }