diff --git a/assets/css/app.scss b/assets/css/app.scss
index ba76f8845..7a2d7be57 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -16,4 +16,4 @@
 @import "./layout/main";
 @import "./layout/header";
 @import "./layout/navbar";
-
+@import "./layout/join";
diff --git a/assets/css/layout/_join.scss b/assets/css/layout/_join.scss
new file mode 100644
index 000000000..98915ec5e
--- /dev/null
+++ b/assets/css/layout/_join.scss
@@ -0,0 +1,5 @@
+.max-vh60{
+  max-height: 60vh;
+  overflow: hidden;
+  overflow-y: auto;
+}
diff --git a/assets/css/style.css b/assets/css/style.css
index 3e389bbbd..856c63012 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -543,3 +543,4 @@ label.required:after {
 #modalAdressbook a[aria-expanded="true"] {
     background: white;
 }
+
diff --git a/assets/js/frontend.js b/assets/js/frontend.js
index 9952788e5..dffa6f7ac 100644
--- a/assets/js/frontend.js
+++ b/assets/js/frontend.js
@@ -18,4 +18,7 @@ $(document).ready(function () {
             $('#snackbar').removeClass('show');
         }, 3000);
     }, 500);
-});
\ No newline at end of file
+});
+$(window).on('load', function () {
+    $('[data-toggle="popover"]').popover({html: true});
+});
diff --git a/src/Twig/RoomsInFuture.php b/src/Twig/RoomsInFuture.php
new file mode 100644
index 000000000..6aeda6ed9
--- /dev/null
+++ b/src/Twig/RoomsInFuture.php
@@ -0,0 +1,54 @@
+<?php
+// src/Twig/AppExtension.php
+namespace App\Twig;
+
+use App\Entity\Checklist;
+use App\Entity\MyUser;
+use App\Entity\Rooms;
+use App\Entity\Server;
+use App\Service\LicenseService;
+use App\Service\MessageService;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use function GuzzleHttp\Psr7\str;
+
+class RoomsInFuture extends AbstractExtension
+{
+
+
+    private $licenseService;
+    private $em;
+    public function __construct(EntityManagerInterface  $entityManager, LicenseService $licenseService, TokenStorageInterface $tokenStorage, EntityManagerInterface $em)
+    {
+        $this->licenseService = $licenseService;
+        $this->em = $entityManager;
+    }
+
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('roomsinFuture', [$this, 'roomsinFuture']),
+        ];
+    }
+
+    public function roomsinFuture(Server $server)
+    {
+        $now = new \DateTime();
+        $qb = $this->em->getRepository(Rooms::class)->createQueryBuilder('rooms');
+        $qb->andWhere('rooms.server = :server')
+            ->andWhere('rooms.showRoomOnJoinpage = true')
+            ->andWhere('rooms.start > :now')
+            ->setParameter('server', $server)
+            ->setParameter('now',$now)
+        ->orderBy('rooms.start', 'ASC');
+            $rooms = $qb->getQuery()->getResult();
+
+         return $rooms;
+
+    }
+
+}
\ No newline at end of file
diff --git a/templates/join/index.html.twig b/templates/join/index.html.twig
index e05589ebb..24c9aedd9 100644
--- a/templates/join/index.html.twig
+++ b/templates/join/index.html.twig
@@ -160,15 +160,46 @@
                             Image by {{ image['photographer'] }} </a>
                         <a href="https://www.pexels.com" target="_blank" referrerpolicy="no-referrer"
                            rel="noreferrer noopener"> provided by <img height="30px"
-                                                                       src="{{ asset('images/pexels.png') }}" />
+                                                                       src="{{ asset('images/pexels.png') }}"/>
                         </a>
 
                     {% endif %}
                 </div>
             </div>
-
         </div>
+        {% if server and server|roomsinFuture|length > 0 %}
+            <div class="col-lg-10 mt-3">
+                <div class="card frozenGlas">
+                    <div class="glossy"></div>
+                    <div class="card-body">
+                        <h3 class="h3-responsive text-center">{{ 'Öffentliche Konferenzen'|trans }}</h3>
+                        <div class="max-vh60">
+                            <ul class="list-group">
+
+                                    {% for r in server|roomsinFuture %}
+                                        <li class="list-group-item d-flex align-items-center justify-content-between">
+                                           <b>{{ r.start|date('d.m.Y | H:i') }}</b>
+                                            <h5>{{ r.name }} <a tabindex="0" data-toggle="popover" data-trigger="focus"
+                                                               title="{{ 'Agenda'|trans }}"
+                                                               data-content="{% if r.agenda is not null %}{{ r.agenda|markdown_to_html|escape }}{% else %}{{ 'Keine Angabe'|trans }}{% endif %}"><i
+                                                            class="fa fa-info-circle"></i></a></h5>
+
+                                            {% if r.public %}
+                                                <a href="{{ path('public_subscribe_participant',{'uid':r.uidParticipant}) }}"
+                                                   class="btn btn-sm btn-outline-primary">{{ 'Anmelden'|trans }}</a>
+                                            {% endif %}
+                                        </li>
+
+                                    {% endfor %}
+
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
     </div>
 
+
     {{ include('base/__snack.html.twig') }}
 {% endblock %}