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 d992dfea1..d168fdb80 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,7 +41,6 @@ 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;
@@ -373,15 +372,10 @@ public class Blacksmith extends NPC {
 				rooms.add(new BlacksmithRoom());
 				spawned = true;
 
-				//currently the new quest is disabled in production as it is incomplete
-				if (DeviceCompat.isDebug()){
-					//type = 1+Random.Int(3);
-					type = CRYSTAL;
-					alternative = false;
-				} else {
-					type = OLD;
-					alternative = Random.Int(2) == 0;
-				}
+				//currently only the crystal quest is ready to play
+				//we still roll for quest type however, to ensure seed consistency
+				type = 1+Random.Int(1);
+				alternative = false;
 				
 				given = false;
 				
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 b9647fe9e..01be6ae2e 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,7 +34,6 @@ 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;
 
@@ -80,25 +79,22 @@ public class BlacksmithRoom extends StandardRoom {
 		} while (level.heaps.get( npc.pos ) != null);
 		level.mobs.add( npc );
 
-		//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);
+		int entrancePos;
+		do {
+			entrancePos = level.pointToCell(random( 2 ));
+		} while (level.heaps.get( npc.pos ) != null || entrancePos == npc.pos);
 
-			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);