diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 83b153e44..ddddda3ad 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -544,14 +544,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
 
     SystemService.info()
     .then(function success(data) {
-      var runtimes = data.Runtimes;
-      $scope.availableRuntimes = runtimes;
-      if ('runc' in runtimes) {
-        $scope.config.HostConfig.Runtime = 'runc';
-      }
-      else if (Object.keys(runtimes).length !== 0) {
-        $scope.config.HostConfig.Runtime = Object.keys(runtimes)[0];
-      }
+      $scope.availableRuntimes = Object.keys(data.Runtimes);
+      $scope.config.HostConfig.Runtime = '';
       $scope.state.sliderMaxCpu = 32;
       if (data.NCPU) {
         $scope.state.sliderMaxCpu = data.NCPU;
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index c6d13fb6f..a14c8f1d4 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -503,11 +503,11 @@
               <!-- !privileged-mode -->
               <!-- runtimes -->
               <div class="form-group">
-                <label for="container_runtime" class="col-sm-2 col-lg-1 control-label text-left">Runtime</label>
-                <div class="col-sm-1">
-                  <select class="form-control" ng-model="config.HostConfig.Runtime" id="container_runtime">
-                    <option selected disabled hidden value="">Select a runtime</option>
-                    <option ng-repeat="(runtime, _) in availableRuntimes" ng-value="runtime">{{ runtime }}</option>
+                <label for="container_runtime" class="col-sm-1 control-label text-left">Runtime</label>
+                <div class="col-sm-11">
+                  <select class="form-control" ng-model="config.HostConfig.Runtime"
+                    id="container_runtime" ng-options="runtime for runtime in availableRuntimes">
+                    <option selected value="">Default</option>
                   </select>
                 </div>
               </div>