diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index a372834..082fef8 100644
--- a/mythtv/programs/mythbackend/scheduler.cpp
+++ b/mythtv/programs/mythbackend/scheduler.cpp
@@ -2891,20 +2891,23 @@ void Scheduler::ShutdownServer(int prerollseconds, QDateTime &idleSince)
         QDateTime restarttime = nextRecording->GetRecordingStartTime()
             .addSecs((-1) * prerollseconds);
 
-        // Check if we need to wake up to grab guide date before the next recording
-        QString str = gCoreContext->GetSetting("MythFillSuggestedRunTime");
-        QDateTime guideRefreshTime = MythDate::fromString(str);
-
-        if (gCoreContext->GetNumSetting("MythFillGrabberSuggestsTime") &&
-            guideRefreshTime.isValid() &&
-            (guideRefreshTime > MythDate::current()) &&
-            (guideRefreshTime < restarttime))
-            restarttime = guideRefreshTime;
-
         int add = gCoreContext->GetNumSetting("StartupSecsBeforeRecording", 240);
         if (add)
             restarttime = restarttime.addSecs((-1) * add);
 
+        if (gCoreContext->GetNumSetting("MythFillEnabled"))
+        {
+            // Check if we need to wake up to grab guide date before the next recording
+            QString str = gCoreContext->GetSetting("MythFillSuggestedRunTime");
+            QDateTime guideRefreshTime = MythDate::fromString(str);
+
+            if (gCoreContext->GetNumSetting("MythFillGrabberSuggestsTime") &&
+                guideRefreshTime.isValid() &&
+                (guideRefreshTime > MythDate::current()) &&
+                (guideRefreshTime < restarttime))
+                restarttime = guideRefreshTime;
+        }
+
         QString wakeup_timeformat = gCoreContext->GetSetting("WakeupTimeFormat",
                                                          "hh:mm yyyy-MM-dd");
         QString setwakeup_cmd = gCoreContext->GetSetting("SetWakeuptimeCommand",