diff --git a/apps/calculation/app.cpp b/apps/calculation/app.cpp
index 18f2cd640..26f9ca1c9 100644
--- a/apps/calculation/app.cpp
+++ b/apps/calculation/app.cpp
@@ -66,7 +66,7 @@ bool App::isAcceptableExpression(const Poincare::Expression expression) {
       return false;
     }
   }
-  return TextFieldDelegateApp::isAcceptableExpression(expression);
+  return !expression.isUninitialized();
 }
 
 }
diff --git a/apps/calculation/app.h b/apps/calculation/app.h
index aa0fcc5d3..8d0f75add 100644
--- a/apps/calculation/app.h
+++ b/apps/calculation/app.h
@@ -33,8 +33,8 @@ public:
   bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override;
   bool layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) override;
   // TextFieldDelegateApp
+
   bool isAcceptableExpression(const Poincare::Expression expression) override;
-  bool storeExpressionAllowed() const override { return true; }
 private:
   App(Snapshot * snapshot);
   HistoryController m_historyController;
diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp
index 3406e8b29..7d8595e72 100644
--- a/apps/shared/text_field_delegate_app.cpp
+++ b/apps/shared/text_field_delegate_app.cpp
@@ -82,7 +82,7 @@ bool TextFieldDelegateApp::isAcceptableExpression(const Expression exp) {
   if (exp.isUninitialized()) {
     return false;
   }
-  if (!storeExpressionAllowed() && exp.type() == ExpressionNode::Type::Store) {
+  if (exp.type() == ExpressionNode::Type::Store) {
     return false;
   }
   return true;
diff --git a/apps/shared/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h
index 1ecb60576..482df4d1e 100644
--- a/apps/shared/text_field_delegate_app.h
+++ b/apps/shared/text_field_delegate_app.h
@@ -25,7 +25,6 @@ protected:
   bool fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event);
   bool isFinishingEvent(Ion::Events::Event event);
   virtual bool isAcceptableExpression(const Poincare::Expression expression);
-  virtual bool storeExpressionAllowed() const { return false; }
   static bool ExpressionCanBeSerialized(const Poincare::Expression expression, bool replaceAns, Poincare::Expression ansExpression);
 };