diff --git a/client/internal/gui/src/AddTaskDialog.cpp b/client/internal/gui/src/AddTaskDialog.cpp
index 3fefa3190ba17f0bcbbf1fb965a6113686ef6e73..495500107ebd60e9fe405b2e1864e196f6dc10e4 100644
--- a/client/internal/gui/src/AddTaskDialog.cpp
+++ b/client/internal/gui/src/AddTaskDialog.cpp
@@ -7,7 +7,6 @@
 
 AddTaskDialog::AddTaskDialog(QWidget *parent) : QDialog(parent) {
     setupUi(this);
-
     connect(createButton, &QPushButton::clicked, this, &AddTaskDialog::on_createButton_clicked);
     connect(backButton, &QPushButton::clicked, this, &AddTaskDialog::on_backButton_clicked);
 }
diff --git a/client/internal/gui/src/TasksWindow.cpp b/client/internal/gui/src/TasksWindow.cpp
index 04cebc72dd2ac2632797f1d98e095c77d98fa1bf..05e6fea6d8f150218092a8f1755c25360040714e 100644
--- a/client/internal/gui/src/TasksWindow.cpp
+++ b/client/internal/gui/src/TasksWindow.cpp
@@ -45,13 +45,17 @@ void TasksWindow::setupUi(QMainWindow *UserWindow) {
     for (int i = 0; i < tasks_vector.size(); i++) {
         tasks->insertItem(i, QString::number(tasks_vector[i].id));
     }
+
+    if (tasks_vector.empty()) {
+        tasks->insertItem(0, QString::fromUtf8("Пока заданий нет"));
+    }
     tasks->setCurrentIndex(0);
 
     taskVerticalLayout->addWidget(label);
     taskVerticalLayout->addWidget(tasks);
 
     taskDescription = new QLabel(this);
-    std::string description = tasks_vector[0].description;
+    std::string description = tasks_vector.empty() ? "" : tasks_vector[0].description;
     taskDescription->setText(QString(description.c_str()));
 
     buttonsWidget = new QWidget(centralwidget);
@@ -63,6 +67,9 @@ void TasksWindow::setupUi(QMainWindow *UserWindow) {
     goToTaskButton = new QPushButton(this);
     goToTaskButton->setText(QString::fromUtf8("Перейти к сдаче"));
 
+    if (tasks_vector.empty())
+        goToTaskButton->setDisabled(true);
+
     addTaskButton = new QPushButton(this);
     addTaskButton->setText(QString::fromUtf8("Добавить задание"));
 
@@ -114,4 +121,6 @@ void TasksWindow::updateTasks() {
 
     std::string description = tasks_vector[0].description;
     taskDescription->setText(QString(description.c_str()));
+
+    goToTaskButton->setDisabled(false);
 }