diff --git a/Firmware/IotaWatt/influxDB.cpp b/Firmware/IotaWatt/influxDB.cpp
index 93459c1..266f4d2 100644
--- a/Firmware/IotaWatt/influxDB.cpp
+++ b/Firmware/IotaWatt/influxDB.cpp
@@ -103,7 +103,7 @@ uint32_t influxService(struct serviceBlock* _serviceBlock){
         delete request;
       }
       request = new asyncHTTPrequest;
-      request->setTimeout(5);
+      request->setTimeout(20); // should be configurable for slow servers
       request->setDebug(false);
       {
         char URL[100];
@@ -124,7 +124,12 @@ uint32_t influxService(struct serviceBlock* _serviceBlock){
       reqData.printf_P(PSTR("db=%s&epoch=s&q=select *::field from /.*/"), influxDataBase);
       if(influxTagSet){
         reqData.printf_P(PSTR(" where %s = \'%s\'"), influxTagSet->key, influxVarStr(influxTagSet->value, influxOutputs->first()).c_str());
-      }
+	if(influxBeginPosting){
+	  reqData.printf_P(PSTR(" and time >= %ds"), influxBeginPosting);
+	}
+      } else if(influxBeginPosting){
+	  reqData.printf_P(PSTR(" where time >= %ds"), influxBeginPosting);
+	}
       reqData.write(" order by time desc limit 1");
 
           // Send the request