diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index a73b996d2..86a92ee7d 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -221,8 +221,13 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
   function prepareLabels(config) {
     var labels = {};
     $scope.formValues.Labels.forEach(function (label) {
-      if (label.name && label.value) {
-        labels[label.name] = label.value;
+      if (label.name) {
+        if (label.value) {
+            labels[label.name] = label.value;
+        }
+        else {
+            labels[label.name] = '';
+        }
       }
     });
     config.Labels = labels;
diff --git a/app/portainer/helpers/templateHelper.js b/app/portainer/helpers/templateHelper.js
index b794f90a0..614a47574 100644
--- a/app/portainer/helpers/templateHelper.js
+++ b/app/portainer/helpers/templateHelper.js
@@ -52,8 +52,13 @@ angular.module('portainer.app')
   helper.updateContainerConfigurationWithLabels = function(labelsArray) {
     var labels = {};
     labelsArray.forEach(function (l) {
-      if (l.name && l.value) {
-        labels[l.name] = l.value;
+      if (l.name) {
+        if (l.value) {
+            labels[l.name] = l.value;
+        }
+        else {
+            labels[l.name] = '';
+        }
       }
     });
     return labels;