diff --git a/app/modules/sntp.c b/app/modules/sntp.c
index c4fedba630..74a62e3d8c 100644
--- a/app/modules/sntp.c
+++ b/app/modules/sntp.c
@@ -623,7 +623,7 @@ static void sntp_dolookups (lua_State *L) {
   // Step through each element of the table, converting it to an address
   // at the end, start the lookups. If we have already looked everything up,
   // then move straight to sending the packets.
-  if (state->list_ref == LUA_NOREF) {
+  if ((state->list_ref == LUA_NOREF) || (state->list_ref == LUA_REFNIL)) {
     sntp_dosend();
     return;
   }
@@ -698,8 +698,16 @@ static char *state_init(lua_State *L) {
 
 static char *set_repeat_mode(lua_State *L, bool enable)
 {
+  if (repeat) {
+    os_timer_disarm (&repeat->timer);
+    luaL_unref (L, LUA_REGISTRYINDEX, repeat->sync_cb_ref);
+    luaL_unref (L, LUA_REGISTRYINDEX, repeat->err_cb_ref);
+    luaL_unref (L, LUA_REGISTRYINDEX, repeat->list_ref);
+    c_free(repeat);
+    repeat = NULL;
+  }
+
   if (enable) {
-    set_repeat_mode(L, FALSE);
     repeat = (sntp_repeat_t *) c_malloc(sizeof(sntp_repeat_t));
     if (!repeat) {
       return "no memory";
@@ -716,16 +724,8 @@ static char *set_repeat_mode(lua_State *L, bool enable)
       //The function on_long_timeout returns errors to the developer
       //My guess: Error reporting is a good thing, resume the timer.
     os_timer_arm(&repeat->timer, 1000 * 1000, 1);
-  } else {
-    if (repeat) {
-      os_timer_disarm (&repeat->timer);
-      luaL_unref (L, LUA_REGISTRYINDEX, repeat->sync_cb_ref);
-      luaL_unref (L, LUA_REGISTRYINDEX, repeat->err_cb_ref);
-      luaL_unref (L, LUA_REGISTRYINDEX, repeat->list_ref);
-      c_free(repeat);
-      repeat = NULL;
-    }
   }
+
   return NULL;
 }
 
@@ -787,23 +787,21 @@ static int sntp_sync (lua_State *L)
     if (lua_istable(L, 1)) {
       // Save a reference to the table
       lua_pushvalue(L, 1);
-      luaL_unref (L, LUA_REGISTRYINDEX, state->list_ref);
-      state->list_ref = luaL_ref(L, LUA_REGISTRYINDEX);
-      sntp_dolookups(L);
-      goto good_ret;
     } else {
       size_t l;
       const char *hostname = luaL_checklstring(L, 1, &l);
       if (l>128 || hostname == NULL)
         sync_err("need <128 hostname");
-      err_t err = dns_gethostbyname(hostname, get_free_server(), sntp_dns_found, state);
-      if (err == ERR_INPROGRESS) {
-        goto good_ret;
-      } else if (err == ERR_ARG)
-        sync_err("bad hostname");
 
-      server_count++;
+      /* Construct a singleton table containing the one server */
+      lua_newtable(L);
+      lua_pushnumber(L, 1);
+      lua_pushstring(L, hostname);
+      lua_settable(L, -3);
     }
+    luaL_unref (L, LUA_REGISTRYINDEX, state->list_ref);
+    state->list_ref = luaL_ref(L, LUA_REGISTRYINDEX);
+    sntp_dolookups(L);
   } else if (server_count == 0) {
     // default to ntp pool
     lua_newtable(L);
@@ -818,12 +816,8 @@ static int sntp_sync (lua_State *L)
     luaL_unref (L, LUA_REGISTRYINDEX, state->list_ref);
     state->list_ref = luaL_ref(L, LUA_REGISTRYINDEX);
     sntp_dolookups(L);
-    goto good_ret;
   }
 
-  sntp_dosend ();
-
-good_ret:
   if (!lua_isnoneornil(L, 4)) {
     set_repeat_mode(L, 1);
   }