diff --git a/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml b/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml
index 71551739..d97b6a95 100644
--- a/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml
+++ b/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml
@@ -177,19 +177,6 @@
                                             style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@Model.TimeSelectionAndJoinTimes.Key.Id')"
                                             id="select-interested"> Selecionar Interessados
                                             </button>
-                                        }else{
-                                            @if(Model.TimeSelectionAndJoinTimes.Value.Count > 0 && Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Pendente && Model.TimeSelectionAndJoinTimes.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
-                                            {
-                                              <form  asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
-                                                <input type="hidden" name="id" value="@Model.TimeSelectionAndJoinTimes.Key?.Id">
-                                                <button
-                                                    type="submit"
-                                                    class="button-capacitacao"
-                                                    style="width: fit-content;margin: 20px;">
-                                                    Encerrar inscrições e confirmar sala
-                                                </button>
-                                                </form>
-                                            }
                                         }
                                     </nav>
                                     }
@@ -265,34 +252,31 @@
                                         Cancelar Orientação
                                     </div>
                                 </form>
-                                
-                                @if(Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Marcado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.ConclusaoPendente) {
-                                    if(tempoRestanteEmHoras == 0 
-                                    || tempoRestanteEmHoras == 1)
+
+                                @if (tempoRestanteEmHoras <= 1)
+                                {
+                                    @if (Model.TimeSelectionAndJoinTimes.Key.Ilimitado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Marcado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.ConclusaoPendente)
                                     {
-                                        <button
-                                        id="entrar-sala"
-                                        class="button botao-entrar-active button-right"
-                                        onclick="window.open('@Model.TimeSelectionAndJoinTimes.Key?.LinkSala', '_blank');"
-                                        >
+                                        <button id="entrar-sala"
+                                                class="button botao-entrar-active button-right"
+                                                onclick="window.open('@Model.TimeSelectionAndJoinTimes.Key?.LinkSala', '_blank');">
                                             Entrar na Sala
                                         </button>
-                                    } else {
-                                    <button
-                                        id="entrar-sala"
-                                        class="button botao-entrar button-right"
-                                        desabled
-                                    >
-                                        Entrar na Sala
-                                    </button>
-                                    }   
-                                    
-                                } else {
-                                    <button
-                                        id="entrar-sala"
-                                        class="button botao-entrar button-right"
-                                        desabled
-                                    >
+                                    }else
+                                    {
+                                        <button id="entrar-sala"
+                                                class="button botao-entrar button-right"
+                                                desabled>
+                                            Entrar na Sala
+                                        </button>
+                                    }
+
+                                }
+                                else
+                                {
+                                    <button id="entrar-sala"
+                                            class="button botao-entrar button-right"
+                                            desabled>
                                         Entrar na Sala
                                     </button>
                                 }   
diff --git a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml
index a07d4c7d..9a8eb077 100644
--- a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml
+++ b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml
@@ -188,19 +188,6 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
                                             style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@data.Key.Id')"
                                             id="select-interested"> Selecionar Interessados
                                             </button>
-                                        }else{
-                                            @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
-                                            {
-                                              <form  asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
-                                                <input type="hidden" name="id" value="@data.Key?.Id">
-                                                <button
-                                                    type="submit"
-                                                    class="button-capacitacao"
-                                                    style="width: fit-content;margin: 20px;">
-                                                    Encerrar inscrições e confirmar sala
-                                                </button>
-                                                </form>
-                                            }
                                         }
                                     </nav>
                                     }
@@ -272,14 +259,35 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
                                         Cancelar Orientação
                                     </div>
                                 </form>
-                                
-                               <button
-                                        id="entrar-sala"
-                                        class="button botao-entrar-active button-right"
-                                        onclick="window.open('@data.Key.LinkSala', '_blank');"
-                                        >
+
+                                    @if (tempoRestanteEmHoras <= 1)
+                                    {
+                                        @if (data.Key.Ilimitado || data.Key?.Status == StatusTimeSelection.Marcado || data.Key?.Status == StatusTimeSelection.ConclusaoPendente)
+                                        {
+                                            <button id="entrar-sala"
+                                                    class="button botao-entrar-active button-right"
+                                                    onclick="window.open('@data.Key?.LinkSala', '_blank');">
+                                                Entrar na Sala
+                                            </button>
+                                        }
+                                        else
+                                        {
+                                            <button id="entrar-sala"
+                                                    class="button botao-entrar button-right"
+                                                    desabled>
+                                                Entrar na Sala
+                                            </button>
+                                        }
+
+                                    }
+                                    else
+                                    {
+                                        <button id="entrar-sala"
+                                                class="button botao-entrar button-right"
+                                                desabled>
                                             Entrar na Sala
                                         </button>
+                                    }
                             </div>
                         </div>
                     </div>
@@ -406,7 +414,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
                             }
                         }
                     </div> 
-                    @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
+                  @*   @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
                     {
                         <form  asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
                                 <input type="hidden" name="id" value="@data.Key?.Id">
@@ -417,7 +425,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
                                     Encerrar inscrições e confirmar sala
                                 </button>
                             </form>
-                    }
+                    } *@
                 </div>
             </div>
         </div>
diff --git a/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs b/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs
index d1a16fb8..4308d903 100644
--- a/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs
+++ b/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs
@@ -351,6 +351,10 @@ public async Task<IActionResult> OnGetRenderCalendarAsync()
 
                 time.Key.MaxParticipants = max;
                 time.Key.Ilimitado = freeTimeBackstage?.Ilimitado ?? false;
+                if(time.Key.Ilimitado)
+                {
+                    time.Key.RoomId = CreatePrivateRoom(time.Key, time.Key.PerfilId ?? Guid.Empty);
+                }
             }
 
             var RhListIds = requestHelpList.Keys.Select(kvp => kvp.Id).ToList();