diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index 5c859969..f4d47bce 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -855,9 +855,6 @@ public class MobAI {
     private static void CheckForRespawn(Mob aiAgent) {
 
         try {
-            if(Mob.disciplineDroppers.contains(aiAgent) == true){
-                return; // disc dropper respawns handled elsewhere
-            }
             if (aiAgent.deathTime == 0) {
                 aiAgent.setDeathTime(System.currentTimeMillis());
                 return;
@@ -894,7 +891,7 @@ public class MobAI {
                 }
             } else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000))) {
 
-                if (Zone.respawnQue.contains(aiAgent) == false) {
+                if (Zone.respawnQue.contains(aiAgent) == false && Mob.disciplineDroppers.contains(aiAgent) == false){
                     Zone.respawnQue.add(aiAgent);
                 }
             }
diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index 1b9990de..32c710b5 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -201,7 +201,7 @@ public class WorldServer {
 		LocalDateTime nextHeartbeatTime = LocalDateTime.now();
 		LocalDateTime nextPopulationFileTime = LocalDateTime.now();
 		LocalDateTime nextFlashTrashCheckTime = LocalDateTime.now();
-		LocalDateTime nextHourlyJobTime = LocalDateTime.now().withMinute(0).withSecond(0).plusHours(1);
+		LocalDateTime nextHourlyJobTime = LocalDateTime.now().withMinute(0).withSecond(0).plusHours(0);
 		LocalDateTime nextWareHousePushTime = LocalDateTime.now();
 		LocalDateTime nextDiscSpawn = LocalDateTime.now().withMinute(0).withSecond(0).plusHours(1);
 
@@ -236,7 +236,7 @@ public class WorldServer {
 				//}else{
 				//	nextHourlyJobTime = LocalDateTime.now().withMinute(30).withSecond(0);
 				//}
-				nextHourlyJobTime = LocalDateTime.now().plusMinutes(1);
+				nextHourlyJobTime = nextHourlyJobTime.plusMinutes(30);
 			}
 
 			if (LocalDateTime.now().isAfter(nextWareHousePushTime)) {
@@ -252,7 +252,7 @@ public class WorldServer {
 						dropper.respawn();
 					}
 				}
-				nextDiscSpawn = LocalDateTime.now().plusHours(3).withMinute(0).withSecond(0);
+				nextDiscSpawn = LocalDateTime.now().plusHours(6).withMinute(0).withSecond(0);
 			}
 			ThreadUtils.sleep(50);
 		}