diff --git a/beamerinnerthemehhubeamer.sty b/beamerinnerthemehhubeamer.sty
index a66c5162e3b55dffbfe94543864419a87b248902..903eab8f9b84423f4ebc7b49923a84294e9f1d31 100644
--- a/beamerinnerthemehhubeamer.sty
+++ b/beamerinnerthemehhubeamer.sty
@@ -38,6 +38,10 @@
   \vfill
 }
 
+% make beamer always use the frametitle template, even if frametitle is empty
+\RequirePackage{etoolbox}
+\patchcmd{\endbeamer@frameslide}{\ifx\beamer@frametitle\@empty}{\iffalse}{}{\errmessage{failed to patch}}
+
 
 % Frame title
 \defbeamertemplate*{frametitle}{hhubeamer}[1][]
@@ -45,22 +49,28 @@
   \begin{beamercolorbox}[wd=\paperwidth,ht=2.11cm]{frametitle}
     \begin{tikzpicture}
       \useasboundingbox[fill=white](0,0) rectangle(\the\paperwidth,2.11);
-      % D on the left
-      \fill[hhublue] (0,1.4) rectangle ++(0.3,-0.5);
-      \fill[hhublue] (0.3,1.15) circle (0.25);
-      % bottom line in header
-      \draw[hhuiceblue!65,thick] (.9,0.4) -- ++(12,0);
+      \ifx\insertframetitle\@empty%
+      \else%
+        % D on the left
+        \fill[hhublue] (0,1.4) rectangle ++(0.3,-0.5);
+        \fill[hhublue] (0.3,1.15) circle (0.25);
+        % bottom line in header
+        \draw[hhuiceblue!65,thick] (.9,0.4) -- ++(12,0);
+      \fi
       % Logo
       \node[anchor=south] at (14.5,-.02) {\includegraphics[height=16.8mm]{fig/template/HHU-vertikal.pdf}};
       % Captions
       \ifx\insertframesubtitle\@empty%
           {\node[anchor=west, hhublue,font=\LARGE] at (.75,1.22){\insertframetitle};}
-          \else%
+      \else%
           {\node[anchor=west, hhublue,font=\LARGE] at (.75,1.22){\insertframetitle};
           \node[anchor=west, hhublue,font=\large] at (.75,0){\insertframesubtitle};}%
-          \fi
+      \fi
     \end{tikzpicture}
   \end{beamercolorbox}
+  \ifx\insertframetitle\@empty%
+    \vspace{-1.5cm}
+  \fi
 }
 
 \BeforeBeginEnvironment{frame}{%
@@ -71,6 +81,10 @@
   \setbeamertemplate{frametitle}[separator]%
 }
 
+\define@key{beamerframe}{empty}[true]{%
+  \setbeamertemplate{frametitle}[empty]%
+}
+
 \defbeamertemplate*{frametitle}{separator}
 {%
   %% Heine
@@ -102,6 +116,10 @@
   \end{textblock}
 }
 
+\defbeamertemplate*{frametitle}{empty}[1][]
+{%
+  \vspace{.64cm}
+}
 
 % itemize
 \setbeamertemplate{itemize items}[circle]
diff --git a/beamerouterthemehhubeamer.sty b/beamerouterthemehhubeamer.sty
index c266f77c9a0f0cb6a26a55954602706da81aa4ee..794935991994be6904f5d5f430c1711c07c09fe9 100644
--- a/beamerouterthemehhubeamer.sty
+++ b/beamerouterthemehhubeamer.sty
@@ -1,23 +1,5 @@
 \RequirePackage{tikz}
 
-% Frame title
-% \defbeamertemplate*{frametitle}{lucid}[1][]{
-  % % \vskip0.5cm%
-    % % \begin{beamercolorbox}[wd=\paperwidth,ht=1.2cm]{frametitle}
-    % % \begin{tikzpicture}
-    % % \useasboundingbox(0,0) rectangle(\the\paperwidth,1.2);
-    % % {\usebeamercolor[fg]{frametitle-left}}
-    % % \fill[color=frametitle-left.fg] (0.2,0) rectangle(\the\marginedPaperWidth,1.2);
-    % %  \ifx\insertframesubtitle\@empty%
-        % % {\node[anchor=west] at (0.3,0.61){\usebeamerfont{frametitle}\insertframetitle};}
-        % % \else%
-        % % {\node[anchor= west] at (0.2,0.81){\usebeamerfont{frametitle}\insertframetitle};%
-        % %  \node[anchor= west] at (0.4,0.25){\usebeamerfont{framesubtitle}-\insertframesubtitle};}%
-        % % \fi
-    % % \end{tikzpicture}
-  % % \end{beamercolorbox}
-% }
-
 \setbeamerfont{footer bar}{size=\scriptsize}
 \setbeamerfont{footer bar small}{size=\scriptsize}
 \setbeamerfont{footer bar tiny}{size=\tiny}
diff --git a/presentation.tex b/presentation.tex
index 127ec4771f8c18e1757d56a44a3463d3819a6fbc..009f2fe940c32992893072eba921da5d4b0e5ccd 100644
--- a/presentation.tex
+++ b/presentation.tex
@@ -99,6 +99,10 @@
   \frametitle{Separator with longer title}
 \end{frame}
 
+\begin{frame}[separator]
+  % \frametitle{Separator without title}
+\end{frame}
+
 
 \begin{frame}[separator]
   \frametitle{Separator with}
@@ -122,7 +126,11 @@
 \end{frame}
 
 \begin{frame}
-  Empty frame layout
+  No frame title.
+\end{frame}
+
+\begin{frame}[empty]
+  No frame title, no logo.
 \end{frame}
 
 \end{document}