diff --git a/APPL/ALG/alg_edit_ruimte.asp b/APPL/ALG/alg_edit_ruimte.asp
index 77646bdcda..d201e7fb55 100644
--- a/APPL/ALG/alg_edit_ruimte.asp
+++ b/APPL/ALG/alg_edit_ruimte.asp
@@ -194,6 +194,7 @@ if (!room_exists)
                           readonly: !this_alg.writeman
                         }
                       );
+          times.push(" SELECT 24, '24:00' FROM DUAL");
           FCLTselector( "room_einduur",
                         times.join(" UNION ALL "),
                         { label: L("lcl_estate_gebouw_einduur"),
diff --git a/APPL/ALG/alg_show_ruimte.asp b/APPL/ALG/alg_show_ruimte.asp
index 3a2124fb9e..cb4166ffaa 100644
--- a/APPL/ALG/alg_show_ruimte.asp
+++ b/APPL/ALG/alg_show_ruimte.asp
@@ -135,7 +135,7 @@ if (!room_data.cadcontours.length)
           ROFIELDTR("fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,    {suppressEmpty:true});
 
           ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(room_data.openfrom),   {suppressEmpty:true});
-          ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  toTimeString(room_data.opento),     {suppressEmpty:true});
+          ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  room_data.opento==24?"24:00":toTimeString(room_data.opento),     {suppressEmpty:true});
 
           switch (room_data.workdays)
           {