diff --git a/editor/editor_tests/ui2oh_test.cpp b/editor/editor_tests/ui2oh_test.cpp
index 795d12b584..7dc021adb5 100644
--- a/editor/editor_tests/ui2oh_test.cpp
+++ b/editor/editor_tests/ui2oh_test.cpp
@@ -352,22 +352,6 @@ UNIT_TEST(OpeningHours2TimeTableSet_off)
     TEST_EQUAL(tt.GetExcludeTime()[0].GetStart().GetHourMinutes().GetHoursCount(), 11, ());
     TEST_EQUAL(tt.GetExcludeTime()[0].GetEnd().GetHourMinutes().GetHoursCount(), 13, ());
   }
-  {
-    OpeningHours oh("Mo off; Tu-Su 09:00-17:00");
-    TEST(oh.IsValid(), ());
-
-    TimeTableSet tts;
-
-    TEST(MakeTimeTableSet(oh, tts), ());
-    TEST_EQUAL(tts.Size(), 1, ());
-
-    TEST_EQUAL(tts.GetUnhandledDays(), OpeningDays({osmoh::Weekday::Monday}), ());
-
-    auto const tt = tts.Get(0);
-
-    TEST_EQUAL(tt.GetOpeningTime().GetStart().GetHourMinutes().GetHoursCount(), 9, ());
-    TEST_EQUAL(tt.GetOpeningTime().GetEnd().GetHourMinutes().GetHoursCount(), 17, ());
-  }
 }
 
 UNIT_TEST(OpeningHours2TimeTableSet_plus)
diff --git a/editor/ui2oh.cpp b/editor/ui2oh.cpp
index a40a958c00..fdc4ced5a1 100644
--- a/editor/ui2oh.cpp
+++ b/editor/ui2oh.cpp
@@ -340,9 +340,9 @@ bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts)
 
     if (rulePart.GetModifier() == osmoh::RuleSequence::Modifier::Closed)
     {
-      // Off modifier in the first part in oh is useless. Skip it.
+      // off modifier in the first part in oh is useless.
       if (first == true)
-        continue;
+        return false;
 
       if (!ExcludeRulePart(rulePart, tts))
         return false;
@@ -376,14 +376,6 @@ bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts)
       return false;
   }
 
-  // Check if no OH rule has been correctly processed.
-  if (first)
-  {
-    // No OH rule has been correctly processed.
-    // Set OH parsing as invalid.
-    return false;
-  }
-
   return true;
 }
 } // namespace editor