diff --git a/desmume/src/windows/OGLRender.c b/desmume/src/windows/OGLRender.c
index 425436f13..e63fb8987 100644
--- a/desmume/src/windows/OGLRender.c
+++ b/desmume/src/windows/OGLRender.c
@@ -1364,12 +1364,14 @@ void NDS_glCallList(unsigned long v)
 		{
 			case 0x0:
 			{
-				--clInd;
+				if (clInd > 0)
+				{
+					--clInd;
+					clCmd >>= 8;
+					continue;
+				}
 
-				if (!clInd)
-					break;
-
-				continue;
+				break;				
 			}
 
 			case 0x11 :