diff --git a/apps/shared/list_parameter_controller.cpp b/apps/shared/list_parameter_controller.cpp
index a968b0ce2..567fa053c 100644
--- a/apps/shared/list_parameter_controller.cpp
+++ b/apps/shared/list_parameter_controller.cpp
@@ -97,6 +97,7 @@ bool ListParameterController::handleEnterOnRow(int rowIndex) {
       {
         assert(functionStore()->numberOfModels() > 0);
         functionStore()->removeModel(m_record);
+        setRecord(Ion::Storage::Record());
         StackViewController * stack = (StackViewController *)(parentResponder());
         stack->pop();
         return true;
diff --git a/apps/shared/list_parameter_controller.h b/apps/shared/list_parameter_controller.h
index 5202e8cff..f719918e6 100644
--- a/apps/shared/list_parameter_controller.h
+++ b/apps/shared/list_parameter_controller.h
@@ -14,7 +14,7 @@ public:
   View * view() override { return &m_selectableTableView; }
   const char * title() override;
   bool handleEvent(Ion::Events::Event event) override;
-  virtual void setRecord(Ion::Storage::Record record);
+  void setRecord(Ion::Storage::Record record);
   void didBecomeFirstResponder() override;
   void viewWillAppear() override;
   int numberOfRows() override { return totalNumberOfCells(); }