diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index e7d418efb8fbb70f87eb41aab66ac03a82c3d368..622031b7aead835f8d91b9eeac4ac06362d731a1 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -73,7 +73,6 @@ namespace armarx::armem::gui
 
         periodicUpdateTimer = new QTimer(this);
         periodicUpdateTimer->setInterval(1000 / 60); // Keep this stable.
-        periodicUpdateTimer->start();
 
         // Memory View
         auto retrieveEntityInfo = [this](const MemoryID& entityID) -> PredictionWidget::EntityInfo
@@ -148,6 +147,7 @@ namespace armarx::armem::gui
                 &This::loadFromDisk);
 
         connect(this, &This::connected, this, &This::startQueries);
+        connect(this, &This::connected, this, &This::startPeriodicUpdateTimer);
         connect(updateWidget, &armem::gui::PeriodicUpdateWidget::update, this, &This::startQueries);
 
         connect(periodicUpdateTimer, &QTimer::timeout, this, &This::updateAvailableMemories);
@@ -249,9 +249,15 @@ namespace armarx::armem::gui
         periodicUpdateTimer->stop();
         updateWidget->stopTimer();
 
+        is_connected = false;
+
         emit disconnected();
     }
 
+    void MemoryViewer::startPeriodicUpdateTimer()
+    {
+        periodicUpdateTimer->start();
+    }
 
     const armem::wm::Memory*
     MemoryViewer::getSingleMemoryData(const std::string& memoryName)
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.h b/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
index 8bbea41e87073b6a49ca0492b01ab6d65eadc3dc..7be0874b265375827d22067e4325edcbf6c4bd12 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
@@ -106,6 +106,7 @@ namespace armarx::armem::gui
     private slots:
 
         void startQueries();
+        void startPeriodicUpdateTimer();
         void processQueryResults();
 
         void updateMemoryTree();