diff --git a/engine/client/cl_qparse.c b/engine/client/cl_qparse.c
index e166411d..21d339d8 100644
--- a/engine/client/cl_qparse.c
+++ b/engine/client/cl_qparse.c
@@ -213,6 +213,7 @@ static void CL_ParseQuakeServerInfo( sizebuf_t *msg )
 	clgame.maxEntities = bound( 600, clgame.maxEntities, MAX_EDICTS );
 	clgame.maxModels = MAX_MODELS;
 	Q_strncpy( clgame.maptitle, MSG_ReadString( msg ), sizeof( clgame.maptitle ));
+	Host_ValidateEngineFeatures( ENGINE_FEATURES_MASK, ENGINE_QUAKE_COMPATIBLE );
 
 	// Re-init hud video, especially if we changed game directories
 	clgame.dllFuncs.pfnVidInit();
diff --git a/engine/common/common.h b/engine/common/common.h
index dc9f1366..1dcd3bb4 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -564,7 +564,11 @@ qboolean Sound_SupportedFileFormat( const char *fileext );
 //
 typedef void( *pfnChangeGame )( const char *progname );
 
-qboolean Host_IsQuakeCompatible( void );
+static inline qboolean Host_IsQuakeCompatible( void )
+{
+	return FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ) ? true : false;
+}
+
 void Host_ShutdownWithReason( const char *reason );
 int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGame, pfnChangeGame func );
 void Host_EndGame( qboolean abort, const char *message, ... ) FORMAT_CHECK( 2 );
diff --git a/engine/common/host.c b/engine/common/host.c
index c4b91a45..15c51494 100644
--- a/engine/common/host.c
+++ b/engine/common/host.c
@@ -296,27 +296,6 @@ void Host_ValidateEngineFeatures( uint32_t mask, uint32_t features )
 	host.features = features;
 }
 
-/*
-==============
-Host_IsQuakeCompatible
-
-==============
-*/
-qboolean Host_IsQuakeCompatible( void )
-{
-	// feature set
-	if( FBitSet( host.features, ENGINE_QUAKE_COMPATIBLE ))
-		return true;
-
-#if !XASH_DEDICATED
-	// quake demo playing
-	if( cls.demoplayback == DEMO_QUAKE1 )
-		return true;
-#endif // XASH_DEDICATED
-
-	return false;
-}
-
 /*
 ================
 Host_EndGame