diff --git a/src/libraries/JANA/Utils/JInspector.cc b/src/libraries/JANA/Utils/JInspector.cc
index f06af9b13..475af6d53 100644
--- a/src/libraries/JANA/Utils/JInspector.cc
+++ b/src/libraries/JANA/Utils/JInspector.cc
@@ -630,8 +630,11 @@ void JInspector::PrintObjectAncestors(std::string factory_idx, int object_idx) {
 
 void JInspector::Loop() {
     bool stay_in_loop = true;
-    m_event->GetJApplication()->SetTicker( false ); // TODO: Get the current ticker state first (requires JApplication be modified)
-    m_event->GetJApplication()->SetTimeoutEnabled( false ); // TODO: Get current state and save
+    auto app = m_event->GetJApplication();
+    m_enable_timeout_on_exit = app->IsTimeoutEnabled();
+    m_enable_ticker_on_exit = app->IsTickerEnabled();
+    m_event->GetJApplication()->SetTicker( false );
+    m_event->GetJApplication()->SetTimeoutEnabled( false );
     m_out << std::endl;
     m_out << "--------------------------------------------------------------------------------------" << std::endl;
     m_out << "Welcome to JANA's interactive inspector! Type `Help` or `h` to see available commands." << std::endl;
@@ -716,6 +719,10 @@ void JInspector::Loop() {
         }
     }
 
-    m_event->GetJApplication()->SetTicker( true ); // TODO: Reset to what it was upon entry
-    m_event->GetJApplication()->SetTimeoutEnabled( true ); // TODO: Reset to what it was upon entry
+    if (m_enable_ticker_on_exit) {
+        m_event->GetJApplication()->SetTicker( true );
+    }
+    if (m_enable_timeout_on_exit) {
+        m_event->GetJApplication()->SetTimeoutEnabled( true );
+    }
 }
diff --git a/src/libraries/JANA/Utils/JInspector.h b/src/libraries/JANA/Utils/JInspector.h
index c5da3273b..bc924a027 100644
--- a/src/libraries/JANA/Utils/JInspector.h
+++ b/src/libraries/JANA/Utils/JInspector.h
@@ -32,6 +32,8 @@ class JInspector {
     std::ostream& m_out = std::cout;
     std::istream& m_in = std::cin;
     std::set<std::string> m_discrepancies;
+    bool m_enable_timeout_on_exit = false;
+    bool m_enable_ticker_on_exit = false;
 
 public:
     explicit JInspector(const JEvent* event);