diff --git a/GUI/src/app/pages/generator/generator.component.html b/GUI/src/app/pages/generator/generator.component.html
index cbe15ebf8..11d212355 100644
--- a/GUI/src/app/pages/generator/generator.component.html
+++ b/GUI/src/app/pages/generator/generator.component.html
@@ -289,15 +289,10 @@ <h3>{{section.text}}</h3>
             <input class="footerInputShort" nbInput type="text" maxlength="260" fieldSize="small" [(ngModel)]="seedString">
             <!--Padding-->
             <div class="tabsetPadding"></div>
-            <!--Release Versions Only-->
-            <ng-container *ngIf="global.getGlobalVar('webIsMasterVersion')">
+            <ng-container>
               <button class="footerGenerateButtonNormalSmall" nbButton status="success" [disabled]="!generateSeedButtonEnabled" (click)="generateSeed()">Generate Seed!</button>
               <button class="footerGenerateButtonRaceSmall" nbButton status="info" [disabled]="!generateSeedButtonEnabled" (click)="generateSeed(false, true)">Generate Race Seed!</button>
             </ng-container>
-            <!--Dev Version-->
-            <ng-container *ngIf="!global.getGlobalVar('webIsMasterVersion')">
-              <button class="footerGenerateButton" nbButton fullWidth status="success" [disabled]="!generateSeedButtonEnabled" (click)="generateSeed()">Generate Seed!</button>
-            </ng-container>
           </ng-container>
         </nb-tab>
         <nb-tab [tabTitle]="generateFromFileTabTitle" [active]="global.getGlobalVar('appType') !== 'generator'">
diff --git a/GUI/src/app/providers/GUIGlobal.ts b/GUI/src/app/providers/GUIGlobal.ts
index 9f428bcd9..de941c47e 100644
--- a/GUI/src/app/providers/GUIGlobal.ts
+++ b/GUI/src/app/providers/GUIGlobal.ts
@@ -1506,9 +1506,17 @@ export class GUIGlobal implements OnDestroy {
     }
 
     if (raceSeed) {
+      let masterVersion = this.getGlobalVar("webIsMasterVersion");
+
       useStaticSeed = ""; //Static seeds aren't allowed in race mode
       settingsFile["create_spoiler"] = true; //Force spoiler mode to on
-      settingsFile["encrypt"] = true;
+      
+      if (masterVersion) {
+        settingsFile["encrypt"] = true;
+      }
+      else {
+        settingsFile["web_lock"] = true; //This is filtered out by the web endpoint before generation
+      }
     }
     else {
       delete settingsFile["encrypt"];