diff --git a/src/doom/st_stuff.c b/src/doom/st_stuff.c
index a4393e09a6..58574ff1da 100644
--- a/src/doom/st_stuff.c
+++ b/src/doom/st_stuff.c
@@ -1337,17 +1337,16 @@ ST_Responder (event_t* ev)
       // [crisp] allow IDCLEV during demo playback and warp to the requested map
       if (demoplayback)
       {
-          if (map > gamemap)
+          crispy->demowarp = map;
+          nodrawers = true;
+          singletics = true;
+
+          if (map <= gamemap)
           {
-              crispy->demowarp = map;
-              nodrawers = true;
-              singletics = true;
-              return true;
-          }
-          else
-          {
-              return false;
+              G_DoPlayDemo();
           }
+
+           return true;
       }
       else
       G_DeferedInitNew(gameskill, epsd, map);