diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala
index 3f5489a..92b4360 100644
--- a/src/main/scala/app/RepositorySettingsController.scala
+++ b/src/main/scala/app/RepositorySettingsController.scala
@@ -72,7 +72,7 @@
       repository.owner,
       repository.name,
       form.description,
-      form.defaultBranch,
+      if(repository.branchList.isEmpty) "master" else form.defaultBranch,
       repository.repository.parentUserName.map { _ =>
         repository.repository.isPrivate
       } getOrElse form.isPrivate
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index 5c76578..73a7780 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -20,11 +20,18 @@
           </fieldset>
           <fieldset class="margin">
             <label for="defaultBranch" class="strong">Default Branch:</label>
-            <select name="defaultBranch" id="defaultBranch">
-              @repository.branchList.map { branch =>
-                <option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+            <select name="defaultBranch" id="defaultBranch"@if(repository.branchList.isEmpty){ disabled}>
+              @if(repository.branchList.isEmpty){
+                <option value="none" selected>No Branch</option>
+              } else {
+                @repository.branchList.map { branch =>
+                  <option@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+                }
               }
             </select>
+            @if(repository.branchList.isEmpty){
+              <input type="hidden" name="defaultBranch" value="none"/>
+            }
             <span class="error" id="error-defaultBranch"></span>
           </fieldset>
           <fieldset class="margin">