diff --git a/src/main.ts b/src/main.ts
index 4e2c090..c8bbe85 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -56,6 +56,7 @@ Mongo.MongoClient.connect(options['database'],
     }
 )
 
+
 var queue = new Queue.Queue<MqttMessage.MqttMessage>()
 queue.on('data', () => {
   if (dbReady) {
@@ -92,27 +93,28 @@ mqttClient.on('connect', () => {
   mqttClient.publish('MqttMongo/Status', 'hello, started up')
 })
 
-var uptime : number = 0
-var uptimeInterval = setInterval(() => {
-  uptime++
-  mqttClient.publish('MqttMongo/Status', `{'Uptime': ${uptime}}`)
-}, 1000)
-
 var msgCnt : number = 0
 mqttClient.on('message', (topic : string, message : string) => {
   msgCnt++;
   console.log(`message received ${msgCnt}, topic ${topic}, payload ${message}`)
-  var mqttMessage = new MqttMessage.MqttMessage(topic, message)
 
   if (topic == "MqttMongo/Command" && message == "shutdown") {
     clearInterval(uptimeInterval)
     mqttClient.end()
     dbHandle.close()
   } else {
+    var mqttMessage = new MqttMessage.MqttMessage(topic, message)
     queue.enq(mqttMessage)
   }
 })
 
 
+var uptime : number = 0
+var uptimeInterval = setInterval(() => {
+  uptime++
+  mqttClient.publish('MqttMongo/Status', `{'Uptime': ${uptime}}`)
+}, 1000)
+
+
 
 console.log("MqttMongo started")
\ No newline at end of file