diff --git a/source/src/main.cpp b/source/src/main.cpp
index bf3bb3e6..7846cc4b 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -24,8 +24,8 @@ void cleanup(char *msg)         // single program exit point;
 
 void quit()                     // normal exit
 {
-    extern void stopn();
-    stopn();
+    extern void stopreset();
+    if(demoplayback) stopreset(); else stop();
     writeservercfg();
     writecfg();
     cleanup(NULL);
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index fd23c800..d0648933 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -297,7 +297,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
         drawequipicons();
 
         glMatrixMode(GL_MODELVIEW);
-        if(!hideradar) drawradar(w, h);
+        if(!menuvisible && !hideradar) drawradar(w, h);
         else drawteamicons(w, h);
         glMatrixMode(GL_PROJECTION);