diff --git a/gsm-frontend/src/components/ServerDetailModal.jsx b/gsm-frontend/src/components/ServerDetailModal.jsx
index 5154ce2..89131bb 100644
--- a/gsm-frontend/src/components/ServerDetailModal.jsx
+++ b/gsm-frontend/src/components/ServerDetailModal.jsx
@@ -10,7 +10,7 @@ export default function ServerDetailModal({ server, onClose, onUpdate }) {
   const [activeTab, setActiveTab] = useState('overview')
   const [rconCommand, setRconCommand] = useState('')
   const [rconHistory, setRconHistory] = useState([])
-  const [logs, setLogs] = useState('')
+  const [logs, setLogs] = useState(null)
   const logsRef = useRef(null)
   const rconRef = useRef(null)
 
@@ -299,7 +299,7 @@ export default function ServerDetailModal({ server, onClose, onUpdate }) {
                 ref={logsRef}
                 className="terminal rounded h-96 overflow-y-auto p-4 font-mono text-xs text-[#00ff41]/80 whitespace-pre-wrap"
               >
-                {logs || 'Loading...'}
+                {logs === null ? 'Loading...' : (logs || 'Keine Logs verfügbar')}
               </div>
             </div>
           )}
diff --git a/gsm-frontend/src/pages/ServerDetail.jsx b/gsm-frontend/src/pages/ServerDetail.jsx
index 6e24f85..7a87a2c 100644
--- a/gsm-frontend/src/pages/ServerDetail.jsx
+++ b/gsm-frontend/src/pages/ServerDetail.jsx
@@ -31,7 +31,7 @@ export default function ServerDetail() {
   const [activeTab, setActiveTab] = useState('overview')
   const [rconCommand, setRconCommand] = useState('')
   const [rconHistory, setRconHistory] = useState([])
-  const [logs, setLogs] = useState('')
+  const [logs, setLogs] = useState(null)
   const [whitelistPlayers, setWhitelistPlayers] = useState([])
   
   const [whitelistInput, setWhitelistInput] = useState('')
@@ -517,7 +517,7 @@ const formatUptime = (seconds) => {
               ref={logsRef}
               className="terminal p-4 logs-container text-xs text-neutral-300 whitespace-pre-wrap"
             >
-              {logs || 'Laden...'}
+              {logs === null ? 'Laden...' : (logs || 'Keine Logs verfügbar')}
             </div>
 
             {/* RCON History */}