diff --git a/amiga/gui.c b/amiga/gui.c
index f03dcd85f..5dbff0395 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1537,7 +1537,7 @@ void ami_get_msg(void)
 	}
 	else if(signal & schedulesig)
 	{
-		timermsg = (struct TimeRequest *)GetMsg(msgport);
+		while(GetMsg(msgport));
 		//schedule_run();
 	}
 }
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 9ce5c6096..42ffb887b 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -62,7 +62,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
 
 	GetSysTime(&tv);
 	AddTime(&nscb->tv,&tv); // now contains time when event occurs
-
+#ifdef AMI_SCHEDULER_USES_TIMER
 	if(nscb->treq = AllocVec(sizeof(struct TimeRequest),MEMF_PRIVATE | MEMF_CLEAR))
 	{
 		*nscb->treq = *tioreq;
@@ -71,7 +71,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
     	nscb->treq->Time.Microseconds=nscb->tv.Microseconds; // micro
     	SendIO((struct IORequest *)nscb->treq);
 	}
-
+#endif
 	nscb->callback = callback;
 	nscb->p = p;
 }