diff --git a/editor/editor_tests/ui2oh_test.cpp b/editor/editor_tests/ui2oh_test.cpp
index 520936a9dc..0eeaa63486 100644
--- a/editor/editor_tests/ui2oh_test.cpp
+++ b/editor/editor_tests/ui2oh_test.cpp
@@ -181,6 +181,10 @@ UNIT_TEST(OpeningHours2TimeTableSt)
 
 UNIT_TEST(TimeTableSt2OpeningHours)
 {
+  {
+    TimeTableSet tts;
+    TEST_EQUAL(ToString(MakeOpeningHours(tts)), "24/7", ());
+  }
   {
     TimeTableSet tts;
     auto tt = tts.Front();
diff --git a/editor/opening_hours_ui.cpp b/editor/opening_hours_ui.cpp
index b924063eaa..0bc5223b6a 100644
--- a/editor/opening_hours_ui.cpp
+++ b/editor/opening_hours_ui.cpp
@@ -315,6 +315,15 @@ TimeTable TimeTableSet::GetComplementTimeTable() const
   return tt;
 }
 
+bool TimeTableSet::IsTwentyFourPerSeven() const
+{
+  return GetUnhandledDays().empty() &&
+         all_of(::begin(m_table), ::end(m_table), [](TimeTable const & tt)
+                {
+                  return tt.IsTwentyFourHours();
+                });
+}
+
 bool TimeTableSet::Append(TimeTable const & tt)
 {
   auto copy = *this;
diff --git a/editor/opening_hours_ui.hpp b/editor/opening_hours_ui.hpp
index ba95d5d4c7..8c4d502372 100644
--- a/editor/opening_hours_ui.hpp
+++ b/editor/opening_hours_ui.hpp
@@ -89,6 +89,8 @@ public:
   size_t Size() const { return m_table.size(); }
   bool Empty() const { return m_table.empty(); }
 
+  bool IsTwentyFourPerSeven() const;
+
   bool Append(TimeTable const & tt);
   bool Remove(size_t const index);
 
diff --git a/editor/ui2oh.cpp b/editor/ui2oh.cpp
index e7085bfb93..72e1c9fa47 100644
--- a/editor/ui2oh.cpp
+++ b/editor/ui2oh.cpp
@@ -161,6 +161,14 @@ namespace editor
 osmoh::OpeningHours MakeOpeningHours(ui::TimeTableSet const & tts)
 {
   ASSERT_GREATER(tts.Size(), 0, ("At least one time table must present."));
+
+  if (tts.IsTwentyFourPerSeven())
+  {
+    osmoh::RuleSequence rulePart;
+    rulePart.SetTwentyFourHours(true);
+    return osmoh::OpeningHours({rulePart});
+  }
+
   osmoh::TRuleSequences rule;
   for (auto const & tt : tts)
   {