diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 07b06b967..158c07803 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1010,7 +1010,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		}
 
 		//FIXME: this is not yet correct
-		if (spr->mobj->sprite2)
+		if (spr->mobj->sprite2 && md2->model->spr2frames)
 		{
 			spr2 = (spr->mobj->sprite2 & ~FF_SPR2SUPER);
 			frame = (spr->mobj->frame & FF_FRAMEMASK);
@@ -1025,7 +1025,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 #ifdef USE_MODEL_NEXTFRAME
 		if (cv_grmodels.value == 1 && tics <= durs)
 		{
-			if (spr->mobj->sprite2)
+			if (spr->mobj->sprite2 && md2->model->spr2frames)
 			{
 				if (HWR_CanInterpolateModel(spr->mobj))
 				{
diff --git a/src/hardware/hw_model.c b/src/hardware/hw_model.c
index d4130df34..63c8b8f34 100644
--- a/src/hardware/hw_model.c
+++ b/src/hardware/hw_model.c
@@ -224,20 +224,12 @@ model_t *LoadModel(const char *filename, int ztag)
 
 void HWR_ReloadModels(void)
 {
-	size_t i;
 	INT32 s;
-
 	for (s = 0; s < MAXSKINS; s++)
 	{
 		if (md2_playermodels[s].model)
 			LoadModelSprite2(md2_playermodels[s].model);
 	}
-
-	for (i = 0; i < NUMSPRITES; i++)
-	{
-		if (md2_models[i].model)
-			LoadModelSprite2(md2_models[i].model);
-	}
 }
 
 void LoadModelSprite2(model_t *model)