diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
index c3566808e..0475ab0a1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
@@ -41,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest;
 import com.watabou.noosa.Game;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Callback;
+import com.watabou.utils.DeviceCompat;
 import com.watabou.utils.Random;
 
 import java.util.ArrayList;
@@ -372,14 +373,21 @@ public class Blacksmith extends NPC {
 				rooms.add(new BlacksmithRoom());
 				spawned = true;
 
-				type = 1+Random.Int(3);
-				alternative = false;
+				//currently the new quest is disabled in production as it is incomplete
+				if (DeviceCompat.isDebug()){
+					type = 1+Random.Int(3);
+					alternative = false;
+				} else {
+					type = 0;
+					alternative = Random.Int(2) == 0;
+				}
 				
 				given = false;
 				
 			}
 			return rooms;
 		}
+
 		public static int Type(){
 			return type;
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/BlacksmithRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/BlacksmithRoom.java
index 858cf07ae..b9647fe9e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/BlacksmithRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/BlacksmithRoom.java
@@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.BurningTrap;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTilemap;
 import com.watabou.noosa.Tilemap;
+import com.watabou.utils.DeviceCompat;
 import com.watabou.utils.Point;
 import com.watabou.utils.Random;
 
@@ -79,24 +80,25 @@ public class BlacksmithRoom extends StandardRoom {
 		} while (level.heaps.get( npc.pos ) != null);
 		level.mobs.add( npc );
 
-		Random.pushGenerator(Dungeon.seedCurDepth()+1);
+		//currently the new quest is disabled in production as it is incomplete
+		if (DeviceCompat.isDebug()) {
 			int entrancePos;
 			do {
 				entrancePos = level.pointToCell(random( 2 ));
 			} while (level.heaps.get( npc.pos ) != null || entrancePos == npc.pos);
-		Random.popGenerator();
 
-		QuestEntrance vis = new QuestEntrance();
-		vis.pos(entrancePos, level);
-		level.customTiles.add(vis);
+			QuestEntrance vis = new QuestEntrance();
+			vis.pos(entrancePos, level);
+			level.customTiles.add(vis);
 
-		level.transitions.add(new LevelTransition(level,
-				entrancePos,
-				LevelTransition.Type.BRANCH_EXIT,
-				Dungeon.depth,
-				Dungeon.branch+1,
-				LevelTransition.Type.BRANCH_ENTRANCE));
-		Painter.set(level, entrancePos, Terrain.EXIT);
+			level.transitions.add(new LevelTransition(level,
+					entrancePos,
+					LevelTransition.Type.BRANCH_EXIT,
+					Dungeon.depth,
+					Dungeon.branch + 1,
+					LevelTransition.Type.BRANCH_ENTRANCE));
+			Painter.set(level, entrancePos, Terrain.EXIT);
+		}
 
 		for(Point p : getPoints()) {
 			int cell = level.pointToCell(p);